* include/bits/locale_facets.h (class num_get): Undo reordering of

	do_get virtual functions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184530 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index eff982f..a1ec1d1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-23  Jason Merrill  <jason@redhat.com>
+
+       * include/bits/locale_facets.h (class num_get): Undo reordering of
+       do_get virtual functions.
+

 2012-02-14  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
        * testsuite/26_numerics/random/
 2012-02-14  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
        * testsuite/26_numerics/random/

diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 3b3139f..dc95f5a 100644 (file)
--- 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
        *  @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); }
       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
 #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
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, float&) const;
 
       virtual iter_type