summaryrefslogtreecommitdiff
path: root/flower
diff options
context:
space:
mode:
authorDan Eble <nine.fierce.ballads@gmail.com>2015-08-25 11:54:21 -0400
committerDan Eble <nine.fierce.ballads@gmail.com>2015-09-11 08:15:40 -0400
commitd36ec1303bce389c9251765e8f2ae25717c74183 (patch)
treef534b6358f52283a0cd183c22d161ed8c02f3305 /flower
parent6afbd8ef9bdea4f7466e5f4fb703d3285bdfe143 (diff)
Issue 4577: Remove the nasty workaround for platforms that don't provide
std::vector::data(). Replace most code that reached into into Grob_array and modified its internal vector with calls to new member functions such as filter(). Move the definitions of some trivial methods into grob-array.hh.
Diffstat (limited to 'flower')
-rw-r--r--flower/include/std-vector.hh49
1 files changed, 0 insertions, 49 deletions
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 <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> (size_t n) : __flower_vector<T, A> (n)
- {
- }
-
- 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 &