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

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

From-SVN: r210968

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c2e7127b56a5735b2a1cc8c76d6c76b947bbe97c..18d60abe0eabf268d4793c398727e81a35fdd7e0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+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>
 
        * include/profile/array: Clean useless white chars.

diff --git a/libstdc++-v3/include/bits/regex_automaton.tcc b/libstdc++-v3/include/bits/regex_automaton.tcc
index e0ac3f94ceb77ca8f4febc8eef4a6654703f2479..1c6cfdd1b9f25a75dd1d1043d4f515b4afd26fdc 100644 (file)
--- a/libstdc++-v3/include/bits/regex_automaton.tcc
+++ b/libstdc++-v3/include/bits/regex_automaton.tcc
@@ -35,7 +35,7 @@ namespace __detail
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #ifdef _GLIBCXX_DEBUG
-  std::ostream&
+  inline std::ostream&
   _State_base::_M_print(std::ostream& ostr) const
   {
     switch (_M_opcode)
@@ -67,7 +67,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   }
 
   // Prints graphviz dot commands for state.
-  std::ostream&
+  inline std::ostream&
   _State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const
   {
     switch (_M_opcode)