Reviewers: ,
Please review this at https://codereview.appspot.com/259230043/
Affected files (+0, -31 lines):
M flower/test-std.cc
M flower/test-string.cc
Index: flower/test-std.cc
diff --git a/flower/test-std.cc b/flower/test-std.cc
index
8fce64abe12041f321c402940421a7ee5a9bf08a..4add05a625a863cbb581c4743ded5281e6fcdfa4
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]);
Index: flower/test-string.cc
diff --git a/flower/test-string.cc b/flower/test-string.cc
index
5ed243fb084d9812694446c6d00af2f3babdabe9..1967d43751caf4a7b5bdabf03dd5f802174185e1
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)
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
