git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2018-05-08 17:21:35 +01:00 committed by Jonathan Wakely
parent 1eac383063
commit ec332f1b44
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
2018-05-08 Jonathan Wakely <jwakely@redhat.com> 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 PR libstdc++/85672
* include/Makefile.am [!ENABLE_FLOAT128]: Change c++config.h entry * include/Makefile.am [!ENABLE_FLOAT128]: Change c++config.h entry
to #undef _GLIBCXX_USE_FLOAT128 instead of defining it to zero. to #undef _GLIBCXX_USE_FLOAT128 instead of defining it to zero.

4
libstdc++-v3/include/bits/regex_automaton.h
View File

@ -210,7 +210,7 @@ namespace __detail
_M_sub_count() const _M_sub_count() const
{ return _M_subexpr_count; } { return _M_subexpr_count; }
std::vector<size_t> _M_paren_stack; _GLIBCXX_STD_C::vector<size_t> _M_paren_stack;
_FlagT _M_flags; _FlagT _M_flags;
_StateIdT _M_start_state; _StateIdT _M_start_state;
_SizeT _M_subexpr_count; _SizeT _M_subexpr_count;
@ -219,7 +219,7 @@ namespace __detail
template<typename _TraitsT> template<typename _TraitsT>
struct _NFA 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 typename _TraitsT::char_type _Char_type;
typedef _State<_Char_type> _StateT; typedef _State<_Char_type> _StateT;