X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ftest-std.cc;h=4add05a625a863cbb581c4743ded5281e6fcdfa4;hb=07125596018d32e3235e80627915cfac77323272;hp=d94dfaa23f252b68e514060bdae99ecc2737ef39;hpb=0e5293e2b73c2185b03ba14d9adc2f636b77b361;p=lilypond.git

diff --git a/flower/test-std.cc b/flower/test-std.cc
index d94dfaa23f..4add05a625 100644
--- a/flower/test-std.cc
+++ b/flower/test-std.cc
@@ -1,20 +1,10 @@
-#define STD_VECTOR 1
-
-#if !STD_VECTOR
-#define Array flower_vector
-#endif
-
 #define HAVE_BOOST_LAMBDA 1
 #include "std-vector.hh"
 
 #include <iostream>
 
 #define YAFFUT_MAIN
-#include "yaffut.h"
-
-#if !STD_VECTOR
-#define vector flower_vector
-#endif
+#include "yaffut.hh"
 
 using namespace std;
 
@@ -27,17 +17,6 @@ print (vector<T> v)
   cout << endl;
 }
 
-#if !STD_VECTOR
-template<typename T>
-void
-print (Link_array<T> v)
-{
-  for (vsize i = 0; i < v.size (); i++)
-    cout << "v[" << i << "] = " << *v[i] << endl;
-  cout << endl;
-}
-#endif
-
 FUNC (vector_erase)
 {
   vector<int> v;
@@ -70,7 +49,7 @@ FUNC (vector_slice)
   EQUAL (vector<int> (v.begin (), v.begin ()).size (), vsize (0));
   EQUAL (vector<int> (v.begin (), v.end ()).size (), v.size ());
   EQUAL (vector<int> (v.begin () + 1, v.begin () + 2).size (),
-		     vsize (1));
+         vsize (1));
 #endif
 }
 
@@ -99,13 +78,13 @@ FUNC (vector_insert)
   v.insert (1, 0);
 #else
   v.insert (v.begin (), 1);
-#endif  
+#endif
   EQUAL (v[0], 1);
 #if VECTOR_INSERT
   v.insert (2, v.size ());
 #else
   v.insert (v.end (), 2);
-#endif  
+#endif
   EQUAL (v.back (), 2);
   vector<int> u;
   u.insert (u.begin (), v.begin (), v.end ());
@@ -118,11 +97,7 @@ FUNC (vector_insert)
 
 FUNC (parray_concat)
 {
-#if !STD_VECTOR
-  Link_array<int> u, v;
-#else
-  vector<int*> u, v;
-#endif  
+  vector<int *> u, v;
   int a[5] = { 0, 1, 2, 3, 4 };
   u.push_back (&a[0]);
   u.push_back (&a[1]);