diff options
| author | Jason Merrill <jason@redhat.com> | 2012-02-23 17:14:56 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-02-23 17:14:56 -0500 |
| commit | 6bfb3eb52e14ed80a789c52506d89e54eb9d2672 (patch) | |
| tree | a0f0ea51938f3eafb2b24e98bfa0b60e0075f6b1 /libstdc++-v3 | |
| parent | 9ebe314b13a5a241e9bab5fb7bd1cc9a2c3904d4 (diff) | |
| download | gcc-6bfb3eb52e14ed80a789c52506d89e54eb9d2672.zip gcc-6bfb3eb52e14ed80a789c52506d89e54eb9d2672.tar.gz gcc-6bfb3eb52e14ed80a789c52506d89e54eb9d2672.tar.bz2 | |
locale_facets.h (class num_get): Undo reordering of do_get virtual functions.
* include/bits/locale_facets.h (class num_get): Undo reordering of
do_get virtual functions.
From-SVN: r184530
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index eff982f..a1ec1d12 100644 --- 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/ 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 |