This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
v3 PATCH to include/bits/locale_facets.h to revert reordering of virtual functions
- From: Jason Merrill <jason at redhat dot com>
- To: gcc-patches List <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>, Benjamin Kosnik <bkoz at redhat dot com>
- Date: Thu, 23 Feb 2012 17:22:35 -0500
- Subject: v3 PATCH to include/bits/locale_facets.h to revert reordering of virtual functions
Benjamin's patch of 2011-08-06 (r177542) to clean up doxygen markup
changed the order of the num_get::do_get virtual functions. This breaks
ABI compatibility, so I'm reverting the change.
Tested x86_64-pc-linux-gnu, applied to trunk.
commit f8566d7934d5ab7006548fa67d596cac2c346d3e
Author: Jason Merrill <jason@redhat.com>
Date: Thu Feb 23 16:59:04 2012 -0500
* include/bits/locale_facets.h (class num_get): Undo reordering of
do_get virtual functions.
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 3b3139f..dc95f5a 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -2169,6 +2169,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
* @return Iterator after reading.
*/
virtual iter_type
+ do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
+
+ virtual iter_type
do_get(iter_type __beg, iter_type __end, ios_base& __io,
ios_base::iostate& __err, long& __v) const
{ return _M_extract_int(__beg, __end, __io, __err, __v); }
@@ -2201,9 +2204,6 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
#endif
virtual iter_type
- do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
-
- virtual iter_type
do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, float&) const;
virtual iter_type