Doc-es: various updates.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 1283bcfcc671ebffdb398864a6f74705fe06911e..d84f90ebd8ab55c85395adbdd6b750bb0d334f19 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -25,6 +25,7 @@
 #include <cstring>
 #include <cerrno>
 #include <cstdio>
+using namespace std;
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -129,7 +130,7 @@ static char const *WARRANTY
 //string lilypond_datadir; // moved to global-data.cc
 
 /* The jail specification: USER, GROUP, JAIL, DIR. */
-std::string jail_spec;
+string jail_spec;
 
 /*  The option parser */
 static Getopt_long *option_parser = 0;
@@ -213,10 +214,6 @@ 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)
 /*