LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Purge all usages of _LIBCPP_STD_VER under test/std/algorithm

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@283643 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-10-08 01:25:23 +00:00
parent daa895f887
commit fd1c9dddcc
17 changed files with 132 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
View File

@@ -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),

9
test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
View File

@@ -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),