From 53a420fba21cf1644972b34dcd811a43cdb8368d Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 2 Jan 2017 19:18:58 +0000
Subject: Vendor import of libc++ trunk r290819:
 https://llvm.org/svn/llvm-project/libcxx/trunk@290819

---
 .../algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp')

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),
-- 
cgit v1.2.3