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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4f980ca21dfe3870eb7daafebdb54e8dc1fa4e34..8c03e2f1d92bb8e63ed14b7b39186d6ed134b0e4 100644 (file)
--- 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 bf51df79097d3b832ba17c1d2ec1a21f034ab210..ff87dcc245d549759fcde5962dc02df699869184 100644 (file)
--- 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;