X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ftest-std.cc;h=4add05a625a863cbb581c4743ded5281e6fcdfa4;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=667afc124a544ef5bfd43c48e6ca09e2c18a7af1;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git diff --git a/flower/test-std.cc b/flower/test-std.cc index 667afc124a..4add05a625 100644 --- a/flower/test-std.cc +++ b/flower/test-std.cc @@ -6,15 +6,15 @@ #define YAFFUT_MAIN #include "yaffut.hh" -using std::vector; +using namespace std; template void print (vector v) { for (vsize i = 0; i < v.size (); i++) - std::cout << "v[" << i << "] = " << v[i] << std::endl; - std::cout << std::endl; + cout << "v[" << i << "] = " << v[i] << endl; + cout << endl; } FUNC (vector_erase) @@ -63,7 +63,7 @@ FUNC (vector_sorting) v.sort (default_compare); #else //sort (v.begin (), v.end ()); - vector_sort (v, std::less ()); + vector_sort (v, less ()); #endif EQUAL (v[0], 0); EQUAL (v[1], 1); @@ -136,7 +136,7 @@ FUNC (parray_uniq) v.push_back (0); v.push_back (1); v.push_back (0); - vector_sort (v, std::less ()); + vector_sort (v, less ()); uniq (v); EQUAL (v.size (), vsize (2)); } @@ -147,6 +147,6 @@ FUNC (vector_search) v.push_back (0); v.push_back (1); v.push_back (2); - vsize i = binary_search (v, 1, std::less ()); + vsize i = binary_search (v, 1, less ()); EQUAL (i, vsize (1)); }