summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-14 05:47:46 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-14 05:47:46 +0000
commitd046d5422addf47472087f258a871285caf705f4 (patch)
treefd3579ef57b9cf8028353bac65831b3e9a4c7774 /libcxx/test
parent9275b21947c53250f7e3bf97cc095f7683f6afc5 (diff)
downloadbcm5719-llvm-d046d5422addf47472087f258a871285caf705f4.tar.gz
bcm5719-llvm-d046d5422addf47472087f258a871285caf705f4.zip
Avoid octal escape sequence warning with MSVC. Patch from STL@microsoft.com
llvm-svn: 272639
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp2
-rw-r--r--libcxx/test/std/re/re.submatch/re.submatch.op/compare.pass.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
index e315fb88d1e..3f1eaf6b959 100644
--- a/libcxx/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
+++ b/libcxx/test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp
@@ -25,5 +25,5 @@ int main()
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/libcxx/test/std/re/re.submatch/re.submatch.op/compare.pass.cpp b/libcxx/test/std/re/re.submatch/re.submatch.op/compare.pass.cpp
index 6770fa4fad5..8000ab6b75c 100644
--- a/libcxx/test/std/re/re.submatch/re.submatch.op/compare.pass.cpp
+++ b/libcxx/test/std/re/re.submatch/re.submatch.op/compare.pass.cpp
@@ -283,6 +283,6 @@ int main()
test(std::string("1234"), std::string("123"));
test(std::wstring(L"123"), std::wstring(L"123"));
test(std::wstring(L"1234"), std::wstring(L"123"));
- test(std::string("123\00056", 6), std::string("123\00056", 6), false);
- test(std::wstring(L"123\00056", 6), std::wstring(L"123\00056", 6), false);
+ test(std::string("123\000" "56", 6), std::string("123\000" "56", 6), false);
+ test(std::wstring(L"123\000" L"56", 6), std::wstring(L"123\000" L"56", 6), false);
}
OpenPOWER on IntegriCloud