#include <test_macros.h> in all the regex tests, and remove all mentions of __cpluplus (use TEST_STD_VERS and/or XFAIL instead). No functional change

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@267567 91177308-0d34-0410-b5e6-96231b3b80d8

test/std/re/re.alg/re.alg.match/awk.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.match/basic.fail.cpp

@@ -18,12 +18,11 @@
 //                    regex_constants::match_flag_type = 
 //                      regex_constants::match_default) = delete;
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -33,4 +32,3 @@ int main()
         std::regex_match(std::string("abcde"), m, re);
     }
 }
-#endif

test/std/re/re.alg/re.alg.match/basic.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.match/ecma.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.match/egrep.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.match/extended.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.match/grep.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.match/lookahead_capture.pass.cpp

@@ -22,6 +22,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp

@@ -21,6 +21,7 @@
 #include <string>
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test1()

test/std/re/re.alg/re.alg.replace/test1.pass.cpp

@@ -22,6 +22,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.replace/test2.pass.cpp

@@ -22,6 +22,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.replace/test3.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.alg/re.alg.replace/test4.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.alg/re.alg.replace/test5.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.alg/re.alg.replace/test6.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.alg/re.alg.search/awk.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.search/backup.pass.cpp

@@ -20,6 +20,7 @@
 #include <string>
 #include <list>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.alg/re.alg.search/basic.fail.cpp

@@ -18,12 +18,11 @@
 //                     regex_constants::match_flag_type = 
 //                       regex_constants::match_default) = delete;
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -33,4 +32,3 @@ int main()
         std::regex_search(std::string("abcde"), m, re);
     }
 }
-#endif

test/std/re/re.alg/re.alg.search/basic.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.search/ecma.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.search/egrep.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.alg/re.alg.search/extended.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 #include "platform_support.h" // locale name macros

test/std/re/re.alg/re.alg.search/lookahead.pass.cpp

@@ -20,6 +20,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main() 
 {

test/std/re/re.alg/re.alg.search/no_update_pos.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.badexp/regex_error.pass.cpp

@@ -20,6 +20,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.const/re.err/error_type.pass.cpp

@@ -34,6 +34,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.const/re.matchflag/match_flag_type.pass.cpp

@@ -34,6 +34,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.const/re.matchflag/match_not_bol.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.const/re.matchflag/match_not_eol.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.const/re.synopt/syntax_option_type.pass.cpp

@@ -31,6 +31,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp

@@ -17,12 +17,11 @@
 //                      regex_constants::match_flag_type m =
 //                        regex_constants::match_default) = delete;
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -33,4 +32,3 @@ int main()
             std::regex("\\d{3}-\\d{4}"));
     }
 }
-#endif

test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.regiter/types.pass.cpp

@@ -24,6 +24,7 @@
 
 #include <regex>
 #include <type_traits>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp

@@ -18,13 +18,12 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <vector>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -36,4 +35,3 @@ int main()
                                      std::regex("\\d{3}-\\d{4}"), indices);
     }
 }
-#endif

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp

@@ -20,6 +20,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp

@@ -17,12 +17,11 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -33,4 +32,3 @@ int main()
                                       std::regex("\\d{3}-\\d{4}"), {-1, 0, 1});
     }
 }
-#endif

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp

@@ -16,12 +16,11 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -32,4 +31,3 @@ int main()
                                      std::regex("\\d{3}-\\d{4}"), -1);
     }
 }
-#endif

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp

@@ -18,6 +18,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp

@@ -18,12 +18,11 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#if __cplusplus <= 201402L
-#error
-#else
+// XFAIL: C++98, c++03, c++11
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {
@@ -37,4 +36,3 @@ int main()
                                      std::regex("\\d{3}-\\d{4}"), v);
     }
 }
-#endif

test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.iter/re.tokiter/types.pass.cpp

@@ -24,6 +24,7 @@
 
 #include <regex>
 #include <type_traits>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.assign/assign.il.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/copy.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/il.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/ptr.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/string.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.const/constants.pass.cpp

@@ -27,6 +27,7 @@
 
 #include <regex>
 #include <type_traits>
+#include "test_macros.h"
 
 template <class _Tp>
 void where(const _Tp &) {}

test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main() 
 {

test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 static bool error_escape_thrown(const char *pat) 
 {

test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 static bool error_badrepeat_thrown(const char *pat) 
 {

test/std/re/re.regex/re.regex.construct/copy.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.construct/default.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
 

test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp

@@ -18,6 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
+#include "test_macros.h"
 
 template <class Iter>
 void

test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp

@@ -19,6 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
+#include "test_macros.h"
 
 template <class Iter>
 void

test/std/re/re.regex/re.regex.construct/ptr.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/string.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class String>
 void

test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class String>
 void

test/std/re/re.regex/re.regex.locale/imbue.pass.cpp

@@ -19,6 +19,7 @@
 #include <locale>
 #include <cassert>
 
+#include "test_macros.h"
 #include "platform_support.h" // locale name macros
 
 int main()

test/std/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.swap/swap.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/types.pass.cpp

@@ -20,6 +20,7 @@
 
 #include <regex>
 #include <type_traits>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.results/re.results.acc/begin_end.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/cbegin_cend.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/index.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test(std::regex_constants::syntax_option_type syntax)

test/std/re/re.results/re.results.acc/length.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/position.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/prefix.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/str.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.acc/suffix.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.all/get_allocator.pass.cpp

@@ -16,6 +16,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 
 template <class CharT, class Allocator>

test/std/re/re.results/re.results.const/allocator.pass.cpp

@@ -16,6 +16,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 
 template <class CharT, class Allocator>

test/std/re/re.results/re.results.const/default.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.results/re.results.form/form1.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.results/re.results.form/form2.pass.cpp

@@ -21,6 +21,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 #include "test_allocator.h"
 

test/std/re/re.results/re.results.form/form3.pass.cpp

@@ -21,6 +21,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_allocator.h"
 
 int main()

test/std/re/re.results/re.results.form/form4.pass.cpp

@@ -19,6 +19,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.results/re.results.nonmember/equal.pass.cpp

@@ -23,6 +23,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.size/empty.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.results/re.results.size/max_size.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.results/re.results.state/ready.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test1()

test/std/re/re.results/re.results.swap/member_swap.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/re.results.swap/non_member_swap.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 void
 test()

test/std/re/re.results/types.pass.cpp

@@ -27,6 +27,7 @@
 
 #include <regex>
 #include <type_traits>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.submatch/re.submatch.members/compare_string_type.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {