diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-02 19:18:58 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-02 19:18:58 +0000 |
| commit | 53a420fba21cf1644972b34dcd811a43cdb8368d (patch) | |
| tree | 66a19f6f8b65215772549a51d688492ab8addc0d /test/std/algorithms/alg.nonmodifying/alg.equal | |
| parent | b50f1549701eb950921e5d6f2e55ba1a1dadbb43 (diff) | |
Notes
Diffstat (limited to 'test/std/algorithms/alg.nonmodifying/alg.equal')
| -rw-r--r-- | test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp | 8 | ||||
| -rw-r--r-- | test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp index 449753fc263a..e867b86b8312 100644 --- a/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp +++ b/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp @@ -17,11 +17,9 @@ #include <algorithm> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" -#if _LIBCPP_STD_VER > 11 -#define HAS_FOUR_ITERATOR_VERSION -#endif int main() { @@ -31,7 +29,7 @@ int main() assert(std::equal(input_iterator<const int*>(ia), input_iterator<const int*>(ia+s), input_iterator<const int*>(ia))); -#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), @@ -44,7 +42,7 @@ int main() assert(!std::equal(input_iterator<const int*>(ia), input_iterator<const int*>(ia+s), input_iterator<const int*>(ib))); -#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), diff --git a/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp index 047f72062ebd..d57e365a9192 100644 --- a/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp +++ b/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), |