summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-08 01:25:23 +0000
committerEric Fiselier <eric@efcs.ca>2016-10-08 01:25:23 +0000
commite58baed3a38790e5cb26abf6a595735f9c784084 (patch)
tree9e653fef9ba7078dffa240aa062a2d4ec952c826 /libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
parentf96ffe1ebf5130daea67ced2940f8be49cda9d2a (diff)
downloadbcm5719-llvm-e58baed3a38790e5cb26abf6a595735f9c784084.tar.gz
bcm5719-llvm-e58baed3a38790e5cb26abf6a595735f9c784084.zip
Purge all usages of _LIBCPP_STD_VER under test/std/algorithm
llvm-svn: 283643
Diffstat (limited to 'libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp')
-rw-r--r--libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
index 047f72062eb..d57e365a919 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
@@ -19,12 +19,9 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
-#if _LIBCPP_STD_VER > 11
-#define HAS_FOUR_ITERATOR_VERSION
-#endif
-
int comparison_count = 0;
template <typename T>
bool counting_equals ( const T &a, const T &b ) {
@@ -41,7 +38,7 @@ int main()
input_iterator<const int*>(ia+s),
input_iterator<const int*>(ia),
std::equal_to<int>()));
-#ifdef HAS_FOUR_ITERATOR_VERSION
+#if TEST_STD_VER >= 14
assert(std::equal(input_iterator<const int*>(ia),
input_iterator<const int*>(ia+s),
input_iterator<const int*>(ia),
@@ -72,7 +69,7 @@ int main()
input_iterator<const int*>(ia+s),
input_iterator<const int*>(ib),
std::equal_to<int>()));
-#ifdef HAS_FOUR_ITERATOR_VERSION
+#if TEST_STD_VER >= 14
assert(!std::equal(input_iterator<const int*>(ia),
input_iterator<const int*>(ia+s),
input_iterator<const int*>(ib),
OpenPOWER on IntegriCloud