[libcxx] r344194 - Use TEST_STD_VER instead of __cplusplus [NFC]
Aaron Puchert
aaronpuchert at alice-dsl.net
Wed Oct 10 15:35:25 PDT 2018
Author: aaronpuchert
Date: Wed Oct 10 15:35:24 2018
New Revision: 344194
URL: http://llvm.org/viewvc/llvm-project?rev=344194&view=rev
Log:
Use TEST_STD_VER instead of __cplusplus [NFC]
While __cplusplus was only used a few dozen times, TEST_STD_VAR is used
more than 2000 times. So we replace the former by the latter for
consistency in the tests. There should be no functional change.
Modified:
libcxx/trunk/test/libcxx/containers/sequences/vector/db_back.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_front.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_index.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp
libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp
libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp
libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp
libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp
libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp
libcxx/trunk/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_back.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_back.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_back.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
assert(c.back() == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_cback.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_cback.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_cback.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -32,7 +33,7 @@ int main()
assert(c.back() == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -32,7 +33,7 @@ int main()
assert(c.front() == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -33,7 +34,7 @@ int main()
assert(c[1] == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_front.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_front.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_front.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
assert(c.front() == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_index.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_index.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_index.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_index.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
assert(c[0] == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -33,7 +34,7 @@ int main()
bool b = c1.begin() < c2.begin();
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -33,7 +34,7 @@ int main()
int i = c1.begin() - c2.begin();
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
assert(i[1] == 0);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -36,7 +37,7 @@ int main()
i += 2;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -35,7 +36,7 @@ int main()
--i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -35,7 +36,7 @@ int main()
++i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,6 +21,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -33,7 +34,7 @@ int main()
T j = *i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef int T;
typedef std::vector<T, min_allocator<T>> C;
Modified: libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp Wed Oct 10 15:35:24 2018
@@ -22,6 +22,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -36,7 +37,7 @@ int main()
++i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, std::string>>> C;
Modified: libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp Wed Oct 10 15:35:24 2018
@@ -22,6 +22,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
C::value_type j = *i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, std::string>>> C;
Modified: libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp Wed Oct 10 15:35:24 2018
@@ -22,6 +22,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -34,7 +35,7 @@ int main()
++i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, std::string>>> C;
Modified: libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp Wed Oct 10 15:35:24 2018
@@ -22,6 +22,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -33,7 +34,7 @@ int main()
C::value_type j = *i;
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::unordered_map<int, std::string, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, std::string>>> C;
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <cstdlib>
#include <exception>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -30,7 +31,7 @@ int main()
l1.erase(i);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <cstdlib>
#include <exception>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -31,7 +32,7 @@ int main()
l1.erase(i);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -30,7 +31,7 @@ int main()
std::string::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -30,7 +31,7 @@ int main()
std::string::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -30,7 +31,7 @@ int main()
std::string::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1);
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp Wed Oct 10 15:35:24 2018
@@ -20,6 +20,7 @@
#include <exception>
#include <cstdlib>
+#include "test_macros.h"
#include "min_allocator.h"
int main()
@@ -29,7 +30,7 @@ int main()
std::string::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
assert(false);
}
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
S l1("123");
Modified: libcxx/trunk/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp?rev=344194&r1=344193&r2=344194&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp Wed Oct 10 15:35:24 2018
@@ -21,11 +21,13 @@
#include <mutex>
+#include "test_macros.h"
+
std::mutex m;
int foo __attribute__((guarded_by(m)));
static void scoped() {
-#if __cplusplus >= 201703L
+#if TEST_STD_VER >= 17
std::scoped_lock<std::mutex> lock(m);
foo++;
#endif
More information about the libcxx-commits
mailing list