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 808274c6e843c5959853a2d032279631690b4196..001dc3a882c9d26b9dac22a337faad1808c7b73d 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -55,6 +55,7 @@ using namespace std;
 #include "string-convert.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 /*
  * Global options that can be overridden through command line.
@@ -129,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;
@@ -213,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)
 /*
@@ -480,8 +485,8 @@ main_with_guile (void *, int, char **)
    //  " \"" + lilypond_datadir + "/scm/out\")";
    //scm_c_eval_string (scm_pct_set_fallback.c_str() );
    scm_primitive_eval
-     (scm_list_3 (scm_from_locale_symbol ("set!"),
-                  scm_from_locale_symbol ("%compile-fallback-path"),
+     (scm_list_3 (scm_from_latin1_symbol ("set!"),
+                  scm_from_latin1_symbol ("%compile-fallback-path"),
                   scm_from_locale_string (ly_scm_go_dir.c_str())));
 #endif
 
@@ -532,8 +537,8 @@ main_with_guile (void *, int, char **)
   // SCM result = scm_call_1 (
   //                      scm_variable_ref (call_with_error_handling),
   //                      scm_call_1 (ly_lily_module_constant ("lilypond-main"), files));
-  SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
-  (void) result;
+
+  Lily::lilypond_main (files);
 
   /* Unreachable.  */
   exit (0);