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

[lilypond.git] / flower / include / std-vector.hh

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index fae955854ba63dea1e362881d4e647fde3d61a29..7b50f27b4bbb320cbb3e52e5b2f7137cdb33880f 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -36,7 +36,6 @@
 #include <cassert>
 #include <string>
 
-using namespace std;
 
 template<typename T>
 int default_compare (T const &a, T const &b)
@@ -86,19 +85,19 @@ public:
   typedef typename __flower_vector<T>::iterator iterator;
   typedef typename __flower_vector<T>::const_iterator const_iterator;
 
-  vector<T, A> () : __flower_vector<T, A> ()
+  std::vector<T, A> () : __flower_vector<T, A> ()
   {
   }
 
-  vector<T, A> (size_t n) : __flower_vector<T, A> (n)
+  std::vector<T, A> (size_t n) : __flower_vector<T, A> (n)
   {
   }
 
-  vector<T, A> (vector<T, A> const &v) : __flower_vector<T, A> (v)
+  std::vector<T, A> (std::vector<T, A> const &v) : __flower_vector<T, A> (v)
   {
   }
 
-  vector<T, A> (const_iterator b, const_iterator e) : __flower_vector<T, A> (b, e)
+  std::vector<T, A> (const_iterator b, const_iterator e) : __flower_vector<T, A> (b, e)
   {
   }
 
@@ -121,7 +120,7 @@ public:
 
 template<typename T>
 T const &
-boundary (vector<T> const &v, int dir, vsize i)
+boundary (std::vector<T> const &v, int dir, vsize i)
 {
   assert (dir);
   return v[dir == -1 ? i : v.size () - 1 - i];
@@ -129,7 +128,7 @@ boundary (vector<T> const &v, int dir, vsize i)
 
 template<typename T>
 T &
-boundary (vector<T> &v, int dir, vsize i)
+boundary (std::vector<T> &v, int dir, vsize i)
 {
   assert (dir);
   return v[dir == -1 ? i : v.size () - 1 - i];
@@ -137,35 +136,35 @@ boundary (vector<T> &v, int dir, vsize i)
 
 template<typename T>
 T const &
-back (vector<T> const &v, vsize i)
+back (std::vector<T> const &v, vsize i)
 {
   return v[v.size () - i - 1];
 }
 
 template<typename T>
 T &
-back (vector<T> &v, vsize i)
+back (std::vector<T> &v, vsize i)
 {
   return v[v.size () - i - 1];
 }
 
 template<typename T>
 void
-concat (vector<T> &v, vector<T> const &w)
+concat (std::vector<T> &v, std::vector<T> const &w)
 {
   v.insert (v.end (), w.begin (), w.end ());
 }
 
 template<typename T, typename Compare>
 vsize
-lower_bound (vector<T> const &v,
+lower_bound (std::vector<T> const &v,
              T const &key,
              Compare less,
              vsize b = 0, vsize e = VPOS)
 {
   if (e == VPOS)
     e = v.size ();
-  typename vector<T>::const_iterator i = lower_bound (v.begin () + b,
+  typename std::vector<T>::const_iterator i = lower_bound (v.begin () + b,
                                                       v.begin () + e,
                                                       key,
                                                       less);
@@ -175,7 +174,7 @@ lower_bound (vector<T> const &v,
 
 template<typename T, typename Compare>
 vsize
-upper_bound (vector<T> const &v,
+upper_bound (std::vector<T> const &v,
              T const &key,
              Compare less,
              vsize b = 0, vsize e = VPOS)
@@ -183,7 +182,7 @@ upper_bound (vector<T> const &v,
   if (e == VPOS)
     e = v.size ();
 
-  typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
+  typename std::vector<T>::const_iterator i = upper_bound (v.begin () + b,
                                                       v.begin () + e,
                                                       key,
                                                       less);
@@ -193,7 +192,7 @@ upper_bound (vector<T> const &v,
 
 template<typename T, typename Compare>
 vsize
-binary_search (vector<T> const &v,
+binary_search (std::vector<T> const &v,
                T const &key,
                Compare less,
                vsize b = 0, vsize e = VPOS)
@@ -207,7 +206,7 @@ binary_search (vector<T> const &v,
 
 template<typename T, typename Compare>
 void
-vector_sort (vector<T> &v,
+vector_sort (std::vector<T> &v,
              Compare less,
              vsize b = 0, vsize e = VPOS)
 {
@@ -219,28 +218,28 @@ vector_sort (vector<T> &v,
 
 template<typename T>
 void
-reverse (vector<T> &v)
+reverse (std::vector<T> &v)
 {
-  // CHECKME: for a simple vector, like vector<int>, this should
+  // CHECKME: for a simple vector, like std::vector<int>, this should
   // expand to memrev.
   reverse (v.begin (), v.end ());
 }
 
 template<typename T>
 void
-uniq (vector<T> &v)
+uniq (std::vector<T> &v)
 {
   v.erase (unique (v.begin (), v.end ()), v.end ());
 }
 
 template<typename T>
-typename vector<T>::const_iterator
-find (vector<T> const &v, T const &key)
+typename std::vector<T>::const_iterator
+find (std::vector<T> const &v, T const &key)
 {
   return find (v.begin (), v.end (), key);
 }
 
-template<typename T> struct del : public unary_function<T, void>
+template<typename T> struct del : public std::unary_function<T, void>
 {
   void operator () (T x)
   {
@@ -251,15 +250,15 @@ template<typename T> struct del : public unary_function<T, void>
 
 template<typename T>
 void
-junk_pointers (vector<T> &v)
+junk_pointers (std::vector<T> &v)
 {
   // Hmm.
   for_each (v.begin (), v.end (), del<T> ());
   v.clear ();
 }
 
-vector<string> string_split (string str, char c);
-string string_join (vector<string> const &strs, const string &infix);
+std::vector<std::string> string_split (std::string str, char c);
+std::string string_join (std::vector<std::string> const &strs, const std::string &infix);
 
 #define iterof(i,s) typeof((s).begin()) i((s).begin())