New music function \endSpanners.

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

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index 6d3598954d558715f77c820e1a40b9012ae2be6b..ba5eb8df28c11dcb218e9e9e7334b5805b06c46f 100644 (file)
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -3,7 +3,7 @@
 
 #include <cstdio>
 
-#include "string.hh"
+#include "std-string.hh"
 
 /**
    a struct this for initialising the commandline options.
@@ -20,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
@@ -102,7 +102,7 @@ public:
        @return pointer to next option found.
        0 if error occurred, or next argument is no option.
   */
-  const Long_option_init *operator() ();
+  const Long_option_init *operator () ();
 
   char const *current_arg ();
   char const *get_next_arg ();