Commit ecb249dd by Jonathan Wakely Committed by Jonathan Wakely

re PR libstdc++/61329 (#include <regex> and _GLIBCXX_DEBUG causes multiple symbol definition.)

	PR libstdc++/61329
	* include/bits/regex_automaton.tcc (_State_base::_M_print): Add
	inline specifier.
	(_State_base::_M_dot): Likewise.

From-SVN: r210968
parent 7a10ea9f
2014-05-27 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/61329
* include/bits/regex_automaton.tcc (_State_base::_M_print): Add
inline specifier.
(_State_base::_M_dot): Likewise.
2014-05-24 François Dumont <fdumont@gcc.gnu.org> 2014-05-24 François Dumont <fdumont@gcc.gnu.org>
* include/profile/array: Clean useless white chars. * include/profile/array: Clean useless white chars.
......
...@@ -35,7 +35,7 @@ namespace __detail ...@@ -35,7 +35,7 @@ namespace __detail
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef _GLIBCXX_DEBUG #ifdef _GLIBCXX_DEBUG
std::ostream& inline std::ostream&
_State_base::_M_print(std::ostream& ostr) const _State_base::_M_print(std::ostream& ostr) const
{ {
switch (_M_opcode) switch (_M_opcode)
...@@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// Prints graphviz dot commands for state. // Prints graphviz dot commands for state.
std::ostream& inline std::ostream&
_State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const _State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const
{ {
switch (_M_opcode) switch (_M_opcode)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment