diff options
| author | Dan Eble <nine.fierce.ballads@gmail.com> | 2015-08-10 11:16:04 -0400 |
|---|---|---|
| committer | Dan Eble <nine.fierce.ballads@gmail.com> | 2015-08-17 18:55:29 -0400 |
| commit | ec21294ce6ca5071618f622e4590318a7b24bbac (patch) | |
| tree | 74ed05eb424214c31e7247b02add8f12c2435ccd /flower | |
| parent | 4b448c212466623191bc1781da092c7c8ddb6c53 (diff) | |
Issue 4549: Remove dead "!STD_VECTOR" code in flower tests
Diffstat (limited to 'flower')
| -rw-r--r-- | flower/test-std.cc | 25 | ||||
| -rw-r--r-- | flower/test-string.cc | 6 |
2 files changed, 0 insertions, 31 deletions
diff --git a/flower/test-std.cc b/flower/test-std.cc index 8fce64abe1..4add05a625 100644 --- a/flower/test-std.cc +++ b/flower/test-std.cc @@ -1,9 +1,3 @@ -#define STD_VECTOR 1 - -#if !STD_VECTOR -#define Array flower_vector -#endif - #define HAVE_BOOST_LAMBDA 1 #include "std-vector.hh" @@ -12,10 +6,6 @@ #define YAFFUT_MAIN #include "yaffut.hh" -#if !STD_VECTOR -#define vector flower_vector -#endif - using namespace std; template<typename T> @@ -27,17 +17,6 @@ print (vector<T> v) cout << endl; } -#if !STD_VECTOR -template<typename T> -void -print (Link_array<T> v) -{ - for (vsize i = 0; i < v.size (); i++) - cout << "v[" << i << "] = " << *v[i] << endl; - cout << endl; -} -#endif - FUNC (vector_erase) { vector<int> v; @@ -118,11 +97,7 @@ FUNC (vector_insert) FUNC (parray_concat) { -#if !STD_VECTOR - Link_array<int> u, v; -#else vector<int *> u, v; -#endif int a[5] = { 0, 1, 2, 3, 4 }; u.push_back (&a[0]); u.push_back (&a[1]); diff --git a/flower/test-string.cc b/flower/test-string.cc index 5ed243fb08..1967d43751 100644 --- a/flower/test-string.cc +++ b/flower/test-string.cc @@ -1,5 +1,3 @@ -#define STD_VECTOR 1 - #define HAVE_BOOST_LAMBDA 1 #include "std-vector.hh" @@ -7,10 +5,6 @@ #include "yaffut.hh" -#if !STD_VECTOR -#define vector flower_vector -#endif - using namespace std; FUNC (string_split_join) |