diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-05-27 12:14:17 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-05-27 12:14:17 +0100 |
| commit | ecb249ddf2adce82e03946dab9022203c9e5e5ec (patch) | |
| tree | 35eb20a4b6a9563d8adbae3a07ecda4579bd7985 /libstdc++-v3 | |
| parent | 7a10ea9f108c45e576962256c061786ff1a1b3e8 (diff) | |
| download | gcc-ecb249ddf2adce82e03946dab9022203c9e5e5ec.zip gcc-ecb249ddf2adce82e03946dab9022203c9e5e5ec.tar.gz gcc-ecb249ddf2adce82e03946dab9022203c9e5e5ec.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_automaton.tcc | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c2e7127..18d60ab 100644 --- 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 e0ac3f9..1c6cfdd 100644 --- 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) |