(gui_b): excise std_string option.

diff --git a/ChangeLog b/ChangeLog
index 306806769b1436486ff1b2c65bf8bf4d70a9734a..e51111d5c31354552f15a28adeefa3078c6d4227 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-02-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * configure.in (gui_b): excise std_string option.
+
        * flower/string.cc (Module): excise flower array & string
 
        * flower/include/std-string.hh: excise flower string.

diff --git a/configure.in b/configure.in
index 8dc846f9a9fdaee8d15a983bef4203d7d8ce0f69..a299637f1d039ae1ccc6958282e12bf6bf8de9ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,15 +33,6 @@ AC_ARG_ENABLE(gui,
     [  --enable-gui            compile with experimental GNOME output.  Default: off],
     [gui_b=$enableval])
 
-std_string=yes
-AC_ARG_ENABLE(std-string,
-    [  --enable-std-string     compile with std::string.  Default: on],
-    [std_string=$enableval])
-if test "$std_string" = "yes"; then
-    # Store in config.make rather than in config.hh and have every
-    # source file depend on that.
-    DEFINES="$DEFINES -DSTD_STRING=1"
-fi
 
 std_vector=yes
 AC_ARG_ENABLE(std-string,

diff --git a/flower/file-name.cc b/flower/file-name.cc
index d7129d43d1216f13eccb60fe3892eca8d67c01de..3ec427640bb7b673597b3673875c562027a08472 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -127,9 +127,3 @@ File_name::is_absolute () const
   return (dir_.length () && dir_[0] == DIRSEP) || root_.length ();
 }
 
-#if 0 //STD_STRING
-File_name::File_name (String file_name)
-{
-  *this = File_name (std::string (file_name));
-}
-#endif

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index 3d3a442f541c3c1bd08e0625466aa47d654b5c52..253df35ee8807d81bb6efd87d22af26f98bf6923 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -21,9 +21,6 @@ public:
   std::string ext_;
 
   File_name (std::string);
-#if 0// STD_STRING
-  File_name (String);
-#endif
 
   bool is_absolute () const;
   std::string to_string () const;

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index eda9aa9012eeae66c645ab4d43323015f74ff96e..738a396606a8dd49f1f561cd00625419a798a670 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -258,11 +258,8 @@ String_convert::char_string (char c, int n)
   n = n >= 0 ? n : 0;
   char *ch = new char[ n ];
   memset (ch, c, n);
-#if STD_STRING
   std::string s (ch, n);
-#else
-  std::string s (ch, n);
-#endif
+  
   delete[] ch;
   return s;
 }