Revert r277966. Forgot patch attribution.
llvm-svn: 277967
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: faf3149df62ab1f98e21526b68686a7c62a11062
diff --git a/include/regex b/include/regex
index 42f3dbb..b223e63 100644
--- a/include/regex
+++ b/include/regex
@@ -147,7 +147,7 @@
// construct/copy/destroy:
basic_regex();
explicit basic_regex(const charT* p, flag_type f = regex_constants::ECMAScript);
- basic_regex(const charT* p, size_t len, flag_type f = regex_constants::ECMAScript);
+ basic_regex(const charT* p, size_t len, flag_type f);
basic_regex(const basic_regex&);
basic_regex(basic_regex&&) noexcept;
template <class ST, class SA>
@@ -2519,7 +2519,7 @@
__end_(0)
{__parse(__p, __p + __traits_.length(__p));}
_LIBCPP_INLINE_VISIBILITY
- basic_regex(const value_type* __p, size_t __len, flag_type __f = regex_constants::ECMAScript)
+ basic_regex(const value_type* __p, size_t __len, flag_type __f)
: __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
__end_(0)
{__parse(__p, __p + __len);}
diff --git a/test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp b/test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
deleted file mode 100644
index 90a091a..0000000
--- a/test/std/re/re.regex/re.regex.construct/ptr_size.pass.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <regex>
-
-// template <class charT, class traits = regex_traits<charT>> class basic_regex;
-
-// basic_regex(const charT* p, size_t len);
-
-#include <regex>
-#include <cassert>
-
-template <class CharT>
-void
-test(const CharT* p, std::size_t len, unsigned mc)
-{
- std::basic_regex<CharT> r(p, len);
- assert(r.flags() == std::regex_constants::ECMAScript);
- assert(r.mark_count() == mc);
-}
-
-int main()
-{
- test("\\(a\\)", 5, 0);
- test("\\(a[bc]\\)", 9, 0);
- test("\\(a\\([bc]\\)\\)", 13, 0);
- test("(a([bc]))", 9, 2);
-
- test("(\0)(b)(c)(d)", 12, 4);
- test("(\0)(b)(c)(d)", 9, 3);
- test("(\0)(b)(c)(d)", 3, 1);
- test("(\0)(b)(c)(d)", 0, 0);
-}