Merge branch 'origin' of http://lilypond.org/vc/lilypond into master-hanwen

[lilypond.git] / flower / include / getopt-long.hh

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index c186ce85bb4906f24bfb4c25c751d3b06ee3774a..ba5eb8df28c11dcb218e9e9e7334b5805b06c46f 100644 (file)
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -2,9 +2,8 @@
 #define GETOPT_LONG_HH
 
 #include <cstdio>
-using namespace std;
 
-#include "string.hh"
+#include "std-string.hh"
 
 /**
    a struct this for initialising the commandline options.
@@ -21,12 +20,12 @@ struct Long_option_init
 
   char const *help_str0_;
 
-  String to_string () const;
-  String str_for_help () const;
+  string to_string () const;
+  string str_for_help () const;
   //   NO constructor!
 
   static int compare (Long_option_init const &, Long_option_init const &);
-  static String table_string (Long_option_init *);
+  static string table_string (Long_option_init *);
 };
 
 /** C++ for version of long_getopt.  For processing GNU style command