X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ftest-std.cc;h=667afc124a544ef5bfd43c48e6ca09e2c18a7af1;hb=0e91bb16e020081fbbecab38fb7a8ed1c1a761dd;hp=1c1a71fa3a058f3e91a388cedc749010c6b39a14;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/flower/test-std.cc b/flower/test-std.cc
index 1c1a71fa3a..667afc124a 100644
--- a/flower/test-std.cc
+++ b/flower/test-std.cc
@@ -1,9 +1,3 @@
-#define STD_VECTOR 1
-
-#if !STD_VECTOR
-#define Array flower_vector
-#endif
-
 #define HAVE_BOOST_LAMBDA 1
 #include "std-vector.hh"
 
@@ -12,32 +6,17 @@
 #define YAFFUT_MAIN
 #include "yaffut.hh"
 
-#if !STD_VECTOR
-#define vector flower_vector
-#endif
-
-using namespace std;
+using std::vector;
 
 template<typename T>
 void
 print (vector<T> v)
 {
   for (vsize i = 0; i < v.size (); i++)
-    cout << "v[" << i << "] = " << v[i] << endl;
-  cout << endl;
+    std::cout << "v[" << i << "] = " << v[i] << std::endl;
+  std::cout << std::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
 }
 
@@ -84,7 +63,7 @@ FUNC (vector_sorting)
   v.sort (default_compare);
 #else
   //sort (v.begin (), v.end ());
-  vector_sort (v, less<int> ());
+  vector_sort (v, std::less<int> ());
 #endif
   EQUAL (v[0], 0);
   EQUAL (v[1], 1);
@@ -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]);
@@ -161,7 +136,7 @@ FUNC (parray_uniq)
   v.push_back (0);
   v.push_back (1);
   v.push_back (0);
-  vector_sort (v, less<int> ());
+  vector_sort (v, std::less<int> ());
   uniq (v);
   EQUAL (v.size (), vsize (2));
 }
@@ -172,6 +147,6 @@ FUNC (vector_search)
   v.push_back (0);
   v.push_back (1);
   v.push_back (2);
-  vsize i = binary_search (v, 1, less<int> ());
+  vsize i = binary_search (v, 1, std::less<int> ());
   EQUAL (i, vsize (1));
 }