From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 8 May 2018 16:21:35 +0000 (+0100)
Subject: Make std::regex automata use non-debug vector in Debug Mode
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ec332f1b44acfdc8fd08680ea75b9f3c23626cd0;p=gcc.git

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 4f980ca21df..8c03e2f1d92 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 bf51df79097..ff87dcc245d 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;