diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-08-12 21:56:02 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-08-12 21:56:02 +0000 |
| commit | 54976f2619ab9ccd321acf46dde4c15baeb84694 (patch) | |
| tree | 43d2d54cc7b628da57bae18fb1031d29fb32896f /libcxx/include/regex | |
| parent | c53dd2ac01eb3044da996ad5b8d30ef85a18cda5 (diff) | |
| download | bcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.tar.gz bcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.zip | |
Fixed PR10574: http://llvm.org/bugs/show_bug.cgi?id=10574
llvm-svn: 137522
Diffstat (limited to 'libcxx/include/regex')
| -rw-r--r-- | libcxx/include/regex | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index 9eef1607ec4..5e195696ff2 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -2478,12 +2478,14 @@ public: : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0), __end_(0) {__parse(__first, __last);} +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY basic_regex(initializer_list<value_type> __il, flag_type __f = regex_constants::ECMAScript) : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0), __end_(0) {__parse(__il.begin(), __il.end());} +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS // ~basic_regex() = default; @@ -2492,9 +2494,11 @@ public: _LIBCPP_INLINE_VISIBILITY basic_regex& operator=(const value_type* __p) {return assign(__p);} +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY basic_regex& operator=(initializer_list<value_type> __il) {return assign(__il);} +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS template <class _ST, class _SA> _LIBCPP_INLINE_VISIBILITY basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __p) @@ -2557,11 +2561,15 @@ public: __parse(__first, __last); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + _LIBCPP_INLINE_VISIBILITY basic_regex& assign(initializer_list<value_type> __il, flag_type __f = regex_constants::ECMAScript) {return assign(__il.begin(), __il.end(), __f);} +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + // const operations: _LIBCPP_INLINE_VISIBILITY unsigned mark_count() const {return __marked_count_;} @@ -6069,11 +6077,13 @@ public: const regex_type& __re, const vector<int>& __submatches, regex_constants::match_flag_type __m = regex_constants::match_default); +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b, const regex_type& __re, initializer_list<int> __submatches, regex_constants::match_flag_type __m = regex_constants::match_default); +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS template <size_t _N> regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b, @@ -6162,6 +6172,8 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>:: __init(__a, __b); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + template <class _BidirectionalIterator, class _CharT, class _Traits> regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>:: regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b, @@ -6175,6 +6187,8 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>:: __init(__a, __b); } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + template <class _BidirectionalIterator, class _CharT, class _Traits> template <size_t _N> regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>:: |
