Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / flower / test-std.cc

diff --git a/flower/test-std.cc b/flower/test-std.cc
index 711e9237b65b88f35854a2f1c852561380b3727b..667afc124a544ef5bfd43c48e6ca09e2c18a7af1 100644 (file)
--- a/flower/test-std.cc
+++ b/flower/test-std.cc
@@ -6,7 +6,6 @@
 #define YAFFUT_MAIN
 #include "yaffut.hh"
 
-using namespace std;
 using std::vector;
 
 template<typename T>
@@ -14,8 +13,8 @@ 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;
 }
 
 FUNC (vector_erase)
@@ -64,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);
@@ -137,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));
 }
@@ -148,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));
 }