Revert "Issue 4550 (2/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 1118b9d286ee29a823c6ce0b2a7d6041a9ed19aa..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 ()
 {
@@ -365,13 +374,13 @@ Source_file::get_port () const
 const char Source_file::type_p_name_[] = "ly:source-file?";
 
 SCM
-Source_file::mark_smob ()
+Source_file::mark_smob () const
 {
   return str_port_;
 }
 
 int
-Source_file::print_smob (SCM port, scm_print_state *)
+Source_file::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Source_file ", port);
   scm_puts (name_.c_str (), port);