X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=flower%2Finclude%2Fstd-vector.hh;h=589f7c0db2063a2110241668c5d2ac7ba39d39ce;hb=1de3d397c18622b6061402fef18e625701712bc5;hp=ba85cb5a2aafbed86ea42f834788da2a5004c075;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index ba85cb5a2a..589f7c0db2 100644
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2006--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,11 +25,12 @@
 /*
   leads to dubious crashes - libstdc++  bug?
 */
-#ifndef NDEBUG
+#ifdef DEBUG
 #define _GLIBCXX_DEBUG 1
 #endif
 #endif
 
+#include "config.hh"   /* needed at least for HAVE_STL_DATA_METHOD */
 #include <algorithm>   /* find, reverse, sort */
 #include <functional>  /* unary_function */
 #include <cassert>
@@ -37,10 +38,6 @@
 
 using namespace std;
 
-#if HAVE_BOOST_LAMBDA_LAMBDA_HPP
-#include <boost/lambda/lambda.hpp>
-#endif
-
 template<typename T>
 int default_compare (T const &a, T const &b)
 {
@@ -71,51 +68,7 @@ typedef size_t vsize;
 #define VPOS ((vsize) -1)
 #endif
 
-#if HAVE_STL_DATA_METHOD
-#include <vector>
-#else /* !HAVE_STL_DATA_METHOD */
-#define vector __flower_vector
 #include <vector>
-#undef vector
-
-namespace std {
-
-  /* Interface without pointer arithmetic (iterator) semantics.  */
-  template<typename T, typename A=std::allocator<T> >
-  class vector : public __flower_vector<T, A>
-  {
-  public:
-    typedef typename __flower_vector<T>::iterator iterator;
-    typedef typename __flower_vector<T>::const_iterator const_iterator;
-
-    vector<T, A> () : __flower_vector<T, A> ()
-    {
-    }
-
-    vector<T, A> (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)
-    {
-    }
-
-    T*
-    data ()
-    {
-      return &(*this)[0];
-    }
-
-    T const*
-    data () const
-    {
-      return &(*this)[0];
-    }
-  };
-
-} /* namespace std */
-
-#endif /* !HAVE_STL_DATA_METHOD */
 
 template<typename T>
 T const &
@@ -141,7 +94,7 @@ back (vector<T> const &v, vsize i)
 }
 
 template<typename T>
-T&
+T &
 back (vector<T> &v, vsize i)
 {
   return v[v.size () - i - 1];
@@ -149,7 +102,7 @@ back (vector<T> &v, vsize i)
 
 template<typename T>
 void
-concat (vector<T> &v, vector<T> const& w)
+concat (vector<T> &v, vector<T> const &w)
 {
   v.insert (v.end (), w.begin (), w.end ());
 }
@@ -157,16 +110,16 @@ concat (vector<T> &v, vector<T> const& w)
 template<typename T, typename Compare>
 vsize
 lower_bound (vector<T> const &v,
-	     T const &key,
-	     Compare less,
-	     vsize b=0, vsize e=VPOS)
+             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,
-						      v.begin () + e,
-						      key,
-						      less);
+                                                      v.begin () + e,
+                                                      key,
+                                                      less);
 
   return i - v.begin ();
 }
@@ -174,17 +127,17 @@ lower_bound (vector<T> const &v,
 template<typename T, typename Compare>
 vsize
 upper_bound (vector<T> const &v,
-	     T const &key,
-	     Compare less,
-	     vsize b=0, vsize e=VPOS)
+             T const &key,
+             Compare less,
+             vsize b = 0, vsize e = VPOS)
 {
   if (e == VPOS)
     e = v.size ();
 
   typename vector<T>::const_iterator i = upper_bound (v.begin () + b,
-						      v.begin () + e,
-						      key,
-						      less);
+                                                      v.begin () + e,
+                                                      key,
+                                                      less);
 
   return i - v.begin ();
 }
@@ -192,9 +145,9 @@ upper_bound (vector<T> const &v,
 template<typename T, typename Compare>
 vsize
 binary_search (vector<T> const &v,
-	       T const &key,
-	       Compare less=less<T> (),
-	       vsize b=0, vsize e=VPOS)
+               T const &key,
+               Compare less,
+               vsize b = 0, vsize e = VPOS)
 {
   vsize lb = lower_bound (v, key, less, b, e);
 
@@ -206,8 +159,8 @@ binary_search (vector<T> const &v,
 template<typename T, typename Compare>
 void
 vector_sort (vector<T> &v,
-	     Compare less,
-	     vsize b=0, vsize e=VPOS)
+             Compare less,
+             vsize b = 0, vsize e = VPOS)
 {
   if (e == VPOS)
     e = v.size ();
@@ -238,21 +191,9 @@ find (vector<T> const &v, T const &key)
   return find (v.begin (), v.end (), key);
 }
 
-#if HAVE_BOOST_LAMBDA_LAMBDA_HPP
-#include <boost/lambda/lambda.hpp>
-using namespace boost::lambda;
-template<typename T>
-void
-junk_pointers (vector<T> &v)
-{
-  for_each (v.begin (), v.end (), (delete _1, _1 = 0));
-  v.clear ();
-}
-#else
-
 template<typename T> struct del : public unary_function<T, void>
 {
-  void operator() (T x)
+  void operator () (T x)
   {
     delete x;
     x = 0;
@@ -267,10 +208,9 @@ junk_pointers (vector<T> &v)
   for_each (v.begin (), v.end (), del<T> ());
   v.clear ();
 }
-#endif /* HAVE_BOOST_LAMBDA */
 
 vector<string> string_split (string str, char c);
-string string_join (vector<string> const &strs, string infix);
+string string_join (vector<string> const &strs, const string &infix);
 
 #define iterof(i,s) typeof((s).begin()) i((s).begin())