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

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index d84f90ebd8ab55c85395adbdd6b750bb0d334f19..001dc3a882c9d26b9dac22a337faad1808c7b73d 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -130,7 +130,7 @@ static char const *WARRANTY
 //string lilypond_datadir; // moved to global-data.cc
 
 /* The jail specification: USER, GROUP, JAIL, DIR. */
-string jail_spec;
+std::string jail_spec;
 
 /*  The option parser */
 static Getopt_long *option_parser = 0;
@@ -214,6 +214,10 @@ configure_fpu ()
 
 #endif /* defined(__x86__) || defined(__i386__) */
 
+using std::map;
+using std::string;
+using std::vector;
+
 static void
 env_var_info (FILE *out, char const *key)
 /*