summaryrefslogtreecommitdiff
path: root/test/std/re/re.regex/re.regex.construct
diff options
context:
space:
mode:
Diffstat (limited to 'test/std/re/re.regex/re.regex.construct')
-rw-r--r--test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp5
-rw-r--r--test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp5
-rw-r--r--test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp5
-rw-r--r--test/std/re/re.regex/re.regex.construct/copy.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/default.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/ptr.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/string.pass.cpp1
-rw-r--r--test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp1
13 files changed, 19 insertions, 6 deletions
diff --git a/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp b/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
index 4b7e5e629294..3f1eaf6b959e 100644
--- a/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
@@ -16,13 +16,14 @@
#include <regex>
#include <cassert>
+#include "test_macros.h"
-int main()
+int main()
{
using std::regex_constants::awk;
assert(std::regex_match("\4", std::regex("\\4", awk)));
assert(std::regex_match("\41", std::regex("\\41", awk)));
assert(std::regex_match("\141", std::regex("\\141", awk)));
- assert(std::regex_match("\1411", std::regex("\\1411", awk)));
+ assert(std::regex_match("\141" "1", std::regex("\\1411", awk)));
}
diff --git a/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp b/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
index 9459cd74ccff..3c7e9f5e33c7 100644
--- a/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
@@ -17,8 +17,9 @@
#include <regex>
#include <cassert>
+#include "test_macros.h"
-static bool error_escape_thrown(const char *pat)
+static bool error_escape_thrown(const char *pat)
{
bool result = false;
try {
@@ -29,7 +30,7 @@ static bool error_escape_thrown(const char *pat)
return result;
}
-int main()
+int main()
{
assert(error_escape_thrown("[\\a]"));
assert(error_escape_thrown("\\a"));
diff --git a/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp b/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
index c21672f02c98..0692a59542f6 100644
--- a/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
@@ -17,8 +17,9 @@
#include <regex>
#include <cassert>
+#include "test_macros.h"
-static bool error_badrepeat_thrown(const char *pat)
+static bool error_badrepeat_thrown(const char *pat)
{
bool result = false;
try {
@@ -29,7 +30,7 @@ static bool error_badrepeat_thrown(const char *pat)
return result;
}
-int main()
+int main()
{
assert(error_badrepeat_thrown("?a"));
assert(error_badrepeat_thrown("*a"));
diff --git a/test/std/re/re.regex/re.regex.construct/copy.pass.cpp b/test/std/re/re.regex/re.regex.construct/copy.pass.cpp
index c2788f0fa2c6..a266289c6a88 100644
--- a/test/std/re/re.regex/re.regex.construct/copy.pass.cpp
+++ b/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()
{
diff --git a/test/std/re/re.regex/re.regex.construct/default.pass.cpp b/test/std/re/re.regex/re.regex.construct/default.pass.cpp
index d959c1ec5820..f1d7bf7696d9 100644
--- a/test/std/re/re.regex/re.regex.construct/default.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp b/test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp
index 70d28df370d1..c1554d6c3ebb 100644
--- a/test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp b/test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp
index a38e16234191..4a93d173e6fc 100644
--- a/test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp b/test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
index c4c440e6d246..347989c5de15 100644
--- a/test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/ptr.pass.cpp b/test/std/re/re.regex/re.regex.construct/ptr.pass.cpp
index b99b58b469cf..05fba020566b 100644
--- a/test/std/re/re.regex/re.regex.construct/ptr.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp b/test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
index 138e20efbf65..d37b81592b4e 100644
--- a/test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp b/test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
index d623a15936f4..a0ceb70514bf 100644
--- a/test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/string.pass.cpp b/test/std/re/re.regex/re.regex.construct/string.pass.cpp
index b58b8e03cd20..a8f2e9bf6c20 100644
--- a/test/std/re/re.regex/re.regex.construct/string.pass.cpp
+++ b/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
diff --git a/test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp b/test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp
index 768de568e229..5f87af10224a 100644
--- a/test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp
+++ b/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