Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

[lilypond.git] / flower / file-name.cc

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 188056675f94346469256f8112e8d3fbff384f9b..71b3bf27b5063a469acf05bec3c26bd18cc9f605 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -33,9 +33,8 @@ using namespace std;
 #include <sys/stat.h>
 #endif
 
-#ifdef __CYGWIN__
-#include <sys/cygwin.h>
-#endif
+using std::string;
+using std::vector;
 
 #ifndef ROOTSEP
 #define ROOTSEP ':'
@@ -49,21 +48,6 @@ using namespace std;
 #define EXTSEP '.'
 #endif
 
-#ifdef __CYGWIN__
-static string
-dos_to_posix (const string &file_name)
-{
-  char buf[PATH_MAX] = "";
-  char s[PATH_MAX] = {0};
-  file_name.copy (s, PATH_MAX - 1);
-  /* ugh: char const* argument gets modified.  */
-  int fail = cygwin_conv_to_posix_path (s, buf);
-  if (!fail)
-    return buf;
-  return file_name;
-}
-#endif /* __CYGWIN__ */
-
 /** Use slash as directory separator.  On Windows, they can pretty
     much be exchanged.  */
 #if 0
@@ -144,12 +128,6 @@ File_name::to_string () const
 
 File_name::File_name (string file_name)
 {
-#ifdef __CYGWIN__
-  /* All system functions would work, even if we do not convert to
-     posix file_name, but we would think that \foe\bar\baz.ly is in
-     the cwd.  */
-  file_name = dos_to_posix (file_name);
-#endif
 #ifdef __MINGW32__
   file_name = slashify (file_name);
 #endif