Release: bump Welcome versions.

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

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index 92f305dd84a921c1a3dcf621877d8545c4dbdc03..52c819822c0facc1b68405ae4f7b6fc33378e840 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
@@ -54,7 +54,8 @@ public:
   /** errorcodes: no error, argument expected, no argument expected,
       unknown option, illegal argument (eg. int expected).  */
   enum Errorcod { E_NOERROR = 0, E_ARGEXPECT, E_NOARGEXPECT, E_UNKNOWNOPTION,
-                 E_ILLEGALARG };
+                  E_ILLEGALARG
+                };
 
   /// argument. Set to 0 if not present
   char const *optional_argument_str0_;