Author: marshall
Date: Thu Jul 30 08:56:00 2015
New Revision: 243641
URL: http://llvm.org/viewvc/llvm-project?rev=243641&view=rev
Log:
Change some #ifdefs to #if - thanks to Dexon for thge catch.
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp?rev=243641&r1=243640&r2=243641&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
Thu Jul 30 08:56:00 2015
@@ -20,7 +20,7 @@
#include "test_iterators.h"
-#ifndef TEST_STD_VER >= 11
+#if TEST_STD_VER >= 11
struct S {
S() : i_(0) {}
S(int i) : i_(i) {}
@@ -100,7 +100,7 @@ int main()
test<random_access_iterator<int*> >();
test<int*>();
-#ifndef TEST_STD_VER >= 11
+#if TEST_STD_VER >= 11
test<bidirectional_iterator<S*> >();
test<random_access_iterator<S*> >();
test<S*>();
Modified:
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp?rev=243641&r1=243640&r2=243641&view=diff
==============================================================================
---
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
(original)
+++
libcxx/trunk/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
Thu Jul 30 08:56:00 2015
@@ -21,7 +21,7 @@
#include "test_macros.h"
-#ifndef TEST_STD_VER >= 11
+#if TEST_STD_VER >= 11
#include <memory>
struct indirect_less
@@ -119,7 +119,7 @@ int main()
test<random_access_iterator<int*> >();
test<int*>();
-#ifndef TEST_STD_VER >= 11
+#if TEST_STD_VER >= 11
test<bidirectional_iterator<S*> >();
test<random_access_iterator<S*> >();
test<S*>();
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits