diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-05-08 17:21:35 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-05-08 17:21:35 +0100 |
| commit | ec332f1b44acfdc8fd08680ea75b9f3c23626cd0 (patch) | |
| tree | c778d822d22951e97b80bcff94cb29941ab2562c | |
| parent | 1eac383063f6d91d9fa052c06d46816c6485c8da (diff) | |
| download | gcc-ec332f1b44acfdc8fd08680ea75b9f3c23626cd0.zip gcc-ec332f1b44acfdc8fd08680ea75b9f3c23626cd0.tar.gz gcc-ec332f1b44acfdc8fd08680ea75b9f3c23626cd0.tar.bz2 | |
Make std::regex automata use non-debug vector in Debug Mode
* include/bits/regex_automaton.h (_NFA_base::_M_paren_stack, _NFA):
Use normal std::vector even in Debug Mode.
From-SVN: r260046
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_automaton.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4f980ca..8c03e2f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-05-08 Jonathan Wakely <jwakely@redhat.com> + * include/bits/regex_automaton.h (_NFA_base::_M_paren_stack, _NFA): + Use normal std::vector even in Debug Mode. + PR libstdc++/85672 * include/Makefile.am [!ENABLE_FLOAT128]: Change c++config.h entry to #undef _GLIBCXX_USE_FLOAT128 instead of defining it to zero. diff --git a/libstdc++-v3/include/bits/regex_automaton.h b/libstdc++-v3/include/bits/regex_automaton.h index bf51df7..ff87dcc 100644 --- a/libstdc++-v3/include/bits/regex_automaton.h +++ b/libstdc++-v3/include/bits/regex_automaton.h @@ -210,7 +210,7 @@ namespace __detail _M_sub_count() const { return _M_subexpr_count; } - std::vector<size_t> _M_paren_stack; + _GLIBCXX_STD_C::vector<size_t> _M_paren_stack; _FlagT _M_flags; _StateIdT _M_start_state; _SizeT _M_subexpr_count; @@ -219,7 +219,7 @@ namespace __detail template<typename _TraitsT> struct _NFA - : _NFA_base, std::vector<_State<typename _TraitsT::char_type>> + : _NFA_base, _GLIBCXX_STD_C::vector<_State<typename _TraitsT::char_type>> { typedef typename _TraitsT::char_type _Char_type; typedef _State<_Char_type> _StateT; |