X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=d84f90ebd8ab55c85395adbdd6b750bb0d334f19;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=1283bcfcc671ebffdb398864a6f74705fe06911e;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 1283bcfcc6..d84f90ebd8 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -25,6 +25,7 @@ #include #include #include +using namespace std; #include #include @@ -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) /*