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

[lilypond.git] / lily / source-file.cc

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 5a94927a7ffb549977f5b284f5fda18f3bdf91a6..a3c08d29ba25dd4c65e35460db9ed9986bb77a0c 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -33,7 +33,6 @@
 #include <sstream>
 #else
 #include <strstream>
-#define istringstream(x) istrstream (x, length ())
 #endif
 using namespace std;
 
@@ -42,6 +41,16 @@ using namespace std;
 #include "misc.hh"
 #include "warn.hh"
 
+#if HAVE_SSTREAM
+using std::istringstream;
+#else
+#define istringstream(x) std::istrstream (x, length ())
+#endif
+
+using std::istream;
+using std::string;
+using std::vector;
+
 void
 Source_file::load_stdin ()
 {