diff options
Diffstat (limited to 'libcxx/test/std/utilities/function.objects/logical.operations')
3 files changed, 9 insertions, 3 deletions
diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp index 72f9dc20144..ac94fa5362e 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_and<int> F; @@ -26,7 +28,7 @@ int main() assert(!f(36, 0)); assert(!f(0, 36)); assert(!f(0, 0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_and<> F2; const F2 f2 = F2(); assert( f2(36, 36)); diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp index 8484625a727..4f783dd0f23 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_not<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<F::result_type, bool>::value), "" ); assert(!f(36)); assert(f(0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_not<> F2; const F2 f2 = F2(); assert(!f2(36)); diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp index 7280504403f..3c450a05de1 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_or<int> F; @@ -26,7 +28,7 @@ int main() assert(f(36, 0)); assert(f(0, 36)); assert(!f(0, 0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_or<> F2; const F2 f2 = F2(); assert( f2(36, 36)); |
