From 0f901c7ec4a39f07fd6b942839b669506e3247fb Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 4 Nov 2016 20:26:59 +0000 Subject: [libcxx] [test] Replace _LIBCPP_STD_VER with TEST_STD_VER. This replaces every occurrence of _LIBCPP_STD_VER in the tests with TEST_STD_VER. Additionally, for every affected file, #include "test_macros.h" is being added explicitly if it wasn't already there. https://reviews.llvm.org/D26294 llvm-svn: 286007 --- .../function.objects/logical.operations/logical_and.pass.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp') 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 #include +#include "test_macros.h" + int main() { typedef std::logical_and 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)); -- cgit v1.2.3