Patchwork v3 PATCH to include/bits/locale_facets.h to revert reordering of virtual functions

login
register
mail settings
Submitter Jason Merrill
Date Feb. 23, 2012, 10:22 p.m.
Message ID <4F46BC2B.1060604@redhat.com>
Download mbox | patch
Permalink /patch/142723/
State New
Headers show

Comments

Jason Merrill - Feb. 23, 2012, 10:22 p.m.
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.
Benjamin Kosnik - Feb. 23, 2012, 11:17 p.m.
Thanks Jason.

-benjamin

Patch

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