X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fstd-vector.hh;fp=flower%2Finclude%2Fstd-vector.hh;h=589f7c0db2063a2110241668c5d2ac7ba39d39ce;hb=d36ec1303bce389c9251765e8f2ae25717c74183;hp=fae955854ba63dea1e362881d4e647fde3d61a29;hpb=6afbd8ef9bdea4f7466e5f4fb703d3285bdfe143;p=lilypond.git diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh index fae955854b..589f7c0db2 100644 --- a/flower/include/std-vector.hh +++ b/flower/include/std-vector.hh @@ -68,56 +68,7 @@ typedef size_t vsize; #define VPOS ((vsize) -1) #endif -#if HAVE_STL_DATA_METHOD #include -#else /* !HAVE_STL_DATA_METHOD */ -#define vector __flower_vector -#include -#undef vector - -namespace std -{ - -/* Interface without pointer arithmetic (iterator) semantics. */ -template > -class vector : public __flower_vector -{ -public: - typedef typename __flower_vector::iterator iterator; - typedef typename __flower_vector::const_iterator const_iterator; - - vector () : __flower_vector () - { - } - - vector (size_t n) : __flower_vector (n) - { - } - - vector (vector const &v) : __flower_vector (v) - { - } - - vector (const_iterator b, const_iterator e) : __flower_vector (b, e) - { - } - - T * - data () - { - return &(*this)[0]; - } - - T const * - data () const - { - return &(*this)[0]; - } -}; - -} /* namespace std */ - -#endif /* !HAVE_STL_DATA_METHOD */ template T const &