*** empty log message ***

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

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index 3e5d7000f8c8be827fcadb6dc3dd0dc2acafb730..0ab316fc94ceec4cf1d5a0a49bcdd922a081c116 100644 (file)
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -4,9 +4,6 @@
 #include <cstdio>
 
 #include "std-string.hh"
-using namespace std;
-
-#include "string.hh"
 
 /**
    a struct this for initialising the commandline options.
@@ -23,12 +20,12 @@ struct Long_option_init
 
   char const *help_str0_;
 
-  Std_string to_string () const;
-  Std_string str_for_help () const;
+  std::string to_string () const;
+  std::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 std::string table_string (Long_option_init *);
 };
 
 /** C++ for version of long_getopt.  For processing GNU style command