X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fgetopt-long.hh;h=52c819822c0facc1b68405ae4f7b6fc33378e840;hb=c618987255838a2af9813a69eb1f4f20a8df6315;hp=03b660b30d09ca95d798e05270885a8a397577b4;hpb=bf898a6f737ebdd6a749ea0a14d1056a3566a10e;p=lilypond.git

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index 03b660b30d..52c819822c 100644
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -20,12 +20,12 @@ struct Long_option_init
 
   char const *help_str0_;
 
-  Std_string to_string () const;
-  Std_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 Std_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_;