X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=14fdf2beb3b6ef4c10ff835c60deeca2a5811157;hb=ef31f0442c7be02c90b9e6b2b9e9809def42ae37;hp=a3c08d29ba25dd4c65e35460db9ed9986bb77a0c;hpb=207f71b8b2ab9ca550e841615bedce393e652ca6;p=lilypond.git

diff --git a/lily/source-file.cc b/lily/source-file.cc
index a3c08d29ba..14fdf2beb3 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -33,6 +33,7 @@
 #include <sstream>
 #else
 #include <strstream>
+#define istringstream(x) istrstream (x, length ())
 #endif
 using namespace std;
 
@@ -41,16 +42,6 @@ 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 ()
 {
@@ -371,7 +362,7 @@ Source_file::get_port () const
 /****************************************************************/
 
 
-const char Source_file::type_p_name_[] = "ly:source-file?";
+const char * const Source_file::type_p_name_ = "ly:source-file?";
 
 SCM
 Source_file::mark_smob () const