From: Eric Fiselier <eric@efcs.ca>
Date: Mon, 27 Oct 2014 19:29:32 +0000 (+0000)
Subject: [libcxx] Remove use of uniform initialization from regex tests so that they compile... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aae76493f0d5d8c2858ea70f950366feb759d9ab;p=platform%2Fupstream%2Fllvm.git

[libcxx] Remove use of uniform initialization from regex tests so that they compile in C++03.

Reviewers: danalbert, jroelofs, mclow.lists

Reviewed By: mclow.lists

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D5957

llvm-svn: 220707
---

diff --git a/libcxx/test/re/re.alg/re.alg.match/lookahead_capture.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/lookahead_capture.pass.cpp
index 78e1e65..949739b 100644
--- a/libcxx/test/re/re.alg/re.alg.match/lookahead_capture.pass.cpp
+++ b/libcxx/test/re/re.alg/re.alg.match/lookahead_capture.pass.cpp
@@ -27,10 +27,10 @@
 int main()
 {
     {
-        std::regex re{"^(?=(.))a$"};
+        std::regex re("^(?=(.))a$");
         assert(re.mark_count() == 1);
 
-        std::string s{"a"};
+        std::string s("a");
         std::smatch m;
         assert(std::regex_match(s, m, re));
         assert(m.size() == 2);
@@ -39,10 +39,10 @@ int main()
     }
 
     {
-        std::regex re{"^(a)(?=(.))(b)$"};
+        std::regex re("^(a)(?=(.))(b)$");
         assert(re.mark_count() == 3);
 
-        std::string s{"ab"};
+        std::string s("ab");
         std::smatch m;
         assert(std::regex_match(s, m, re));
         assert(m.size() == 4);
@@ -53,10 +53,10 @@ int main()
     }
 
     {
-        std::regex re{"^(.)(?=(.)(?=.(.)))(...)$"};
+        std::regex re("^(.)(?=(.)(?=.(.)))(...)$");
         assert(re.mark_count() == 4);
 
-        std::string s{"abcd"};
+        std::string s("abcd");
         std::smatch m;
         assert(std::regex_match(s, m, re));
         assert(m.size() == 5);
@@ -68,10 +68,10 @@ int main()
     }
 
     {
-        std::regex re{"^(a)(?!([^b]))(.c)$"};
+        std::regex re("^(a)(?!([^b]))(.c)$");
         assert(re.mark_count() == 3);
 
-        std::string s{"abc"};
+        std::string s("abc");
         std::smatch m;
         assert(std::regex_match(s, m, re));
         assert(m.size() == 4);
@@ -82,10 +82,10 @@ int main()
     }
 
     {
-        std::regex re{"^(?!((b)))(?=(.))(?!(abc)).b$"};
+        std::regex re("^(?!((b)))(?=(.))(?!(abc)).b$");
         assert(re.mark_count() == 4);
 
-        std::string s{"ab"};
+        std::string s("ab");
         std::smatch m;
         assert(std::regex_match(s, m, re));
         assert(m.size() == 5);
diff --git a/libcxx/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
index 6a45418..0b4c694 100644
--- a/libcxx/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
+++ b/libcxx/test/re/re.alg/re.alg.match/parse_curly_brackets.pass.cpp
@@ -25,9 +25,9 @@
 void
 test1()
 {
-    std::string re{"\\{a\\}"};
-    std::string target{"{a}"};
-    std::regex regex{re};
+    std::string re("\\{a\\}");
+    std::string target("{a}");
+    std::regex regex(re);
     std::smatch smatch;
     assert((std::regex_match(target, smatch, regex)));
 }
@@ -35,9 +35,9 @@ test1()
 void
 test2()
 {
-    std::string re{"\\{a\\}"};
-    std::string target{"{a}"};
-    std::regex regex{re, std::regex::extended};
+    std::string re("\\{a\\}");
+    std::string target("{a}");
+    std::regex regex(re, std::regex::extended);
     std::smatch smatch;
     assert((std::regex_match(target, smatch, regex)));
 }
@@ -45,9 +45,9 @@ test2()
 void
 test3()
 {
-    std::string re{"\\{a\\}"};
-    std::string target{"{a}"};
-    std::regex regex{re, std::regex::awk};
+    std::string re("\\{a\\}");
+    std::string target("{a}");
+    std::regex regex(re, std::regex::awk);
     std::smatch smatch;
     assert((std::regex_match(target, smatch, regex)));
 }
@@ -55,9 +55,9 @@ test3()
 void
 test4()
 {
-    std::string re{"\\{a\\}"};
-    std::string target{"{a}"};
-    std::regex regex{re, std::regex::egrep};
+    std::string re("\\{a\\}");
+    std::string target("{a}");
+    std::regex regex(re, std::regex::egrep);
     std::smatch smatch;
     assert((std::regex_match(target, smatch, regex)));
 }
diff --git a/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp
index 6bfad42..7da5860 100644
--- a/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp
+++ b/libcxx/test/re/re.alg/re.alg.search/backup.pass.cpp
@@ -26,10 +26,10 @@ int main()
     // This regex_iterator uses regex_search(__wrap_iter<_Iter> __first, ...)
     // Test for http://llvm.org/bugs/show_bug.cgi?id=16240 fixed in r185273.
     {
-        std::string s{"aaaa a"};
-        std::regex re{"\\ba"};
-        std::sregex_iterator it{s.begin(), s.end(), re};
-        std::sregex_iterator end{};
+        std::string s("aaaa a");
+        std::regex re("\\ba");
+        std::sregex_iterator it(s.begin(), s.end(), re);
+        std::sregex_iterator end = std::sregex_iterator();
 
         assert(it->position(0) == 0);
         assert(it->length(0) == 1);
@@ -44,11 +44,11 @@ int main()
 
     // This regex_iterator uses regex_search(_BidirectionalIterator __first, ...)
     {
-        std::string s{"aaaa a"};
-        std::list<char> l{s.begin(), s.end()};
-        std::regex re{"\\ba"};
-        std::regex_iterator<std::list<char>::iterator> it{l.begin(), l.end(), re};
-        std::regex_iterator<std::list<char>::iterator> end{};
+        std::string s("aaaa a");
+        std::list<char> l(s.begin(), s.end());
+        std::regex re("\\ba");
+        std::regex_iterator<std::list<char>::iterator> it(l.begin(), l.end(), re);
+        std::regex_iterator<std::list<char>::iterator> end = std::regex_iterator<std::list<char>::iterator>();
 
         assert(it->position(0) == 0);
         assert(it->length(0) == 1);
diff --git a/libcxx/test/re/re.alg/re.alg.search/no_update_pos.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/no_update_pos.pass.cpp
index 63fcdaf..ef9cec5 100644
--- a/libcxx/test/re/re.alg/re.alg.search/no_update_pos.pass.cpp
+++ b/libcxx/test/re/re.alg/re.alg.search/no_update_pos.pass.cpp
@@ -25,9 +25,9 @@ int main()
     // of the text.
 
     const char *text = "aaa\naa";
-    std::regex re{"^a"};
-    std::cregex_iterator it{text, text+6, re};
-    std::cregex_iterator end{};
+    std::regex re("^a");
+    std::cregex_iterator it(text, text+6, re);
+    std::cregex_iterator end = std::cregex_iterator();
 
     assert(it->str() == "a");
     assert(it->position(0) == 0);
diff --git a/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp
index 11fce3f..4b7e5e6 100644
--- a/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp
+++ b/libcxx/test/re/re.regex/re.regex.construct/awk_oct.pass.cpp
@@ -21,8 +21,8 @@ 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("\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)));
 }