(gui_b): excise std_string option.

(gui_b): excise std_vector option.

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

diff --git a/configure.in b/configure.in
index a299637f1d039ae1ccc6958282e12bf6bf8de9ff..94d02af55d94c09bd25ce6030f47478d61e29347 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,15 +34,7 @@ AC_ARG_ENABLE(gui,
     [gui_b=$enableval])
 
 
-std_vector=yes
-AC_ARG_ENABLE(std-string,
-    [  --enable-std-vector     compile with std::vector.  Default: on],
-    [std_vector=$enableval])
-if test "$std_vector" = "yes"; then
-    # Store in config.make rather than in config.hh and have every
-    # source file depend on that.
-    DEFINES="$DEFINES -DSTD_VECTOR=1"
-fi
+
 
 NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 6a5ad5cc3e731ec97a0eefc039410d4afc1c708d..99c768d29387a97f9f459470f7851f94c9e4b3ef 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -179,7 +179,6 @@ typedef void (*Translator_void_method_ptr) (Translator *);
 
 
 /* FIXME: when Link_array is dropped, do grand s/r to vector<TYPE*>.  */
-#if STD_VECTOR
 
 #include "std-vector.hh"
 
@@ -202,27 +201,5 @@ typedef void (*Translator_void_method_ptr) (Translator *);
 #define Link_array__Source_file_ std::vector<Source_file*>
 #define Link_array__Spanner_ std::vector<Spanner*>
 #define Link_array__Tie_configuration_ std::vector<Tie_configuration*>
-#else /* !STD_VECTOR */
-#define Link_array__char_ Link_array<char>
-#define Link_array__Grob_ Link_array<Grob>
-#define Link_array__Accidental_placement_entry_ Link_array<Accidental_placement_entry>
-#define Link_array__Audio_item_ Link_array<Audio_item>
-#define Link_array__Audio_note_ Link_array<Audio_note>
-#define Link_array__Audio_piano_pedal_ Link_array<Audio_piano_pedal>
-#define Link_array__Audio_staff_ Link_array<Audio_staff>
-#define Link_array__Bracket_nesting_node_ Link_array<Bracket_nesting_node>
-#define Link_array__Context_ Link_array<Context>
-#define Link_array__Context_def_ Link_array<Context_def>
-#define Link_array__Grob_ Link_array<Grob>
-#define Link_array__Item_ Link_array<Item>
-#define Link_array__Music_ Link_array<Music>
-#define Link_array__Note_column_ Link_array<Note_column>
-#define Link_array__Output_def_ Link_array<Output_def>
-#define Link_array__Slur_configuration_ Link_array<Slur_configuration>
-#define Link_array__Source_file_ Link_array<Source_file>
-#define Link_array__Spanner_ Link_array<Spanner>
-#define Link_array__Tie_configuration_ Link_array<Tie_configuration>
-#endif /* !STD_VECTOR */
-
 
 #endif /* LILY_PROTO_HH */