From bd6757b8d3f5035090b15be64a93427c6534a4da Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 29 Nov 2014 22:58:33 +0000 Subject: [PATCH] nonio.h (__timepunct): Remove unused typedef. * include/bits/locale_facets/nonio.h (__timepunct): Remove unused typedef. (time_get): Likewise. Fix comments. From-SVN: r218183 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets_nonio.h | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 38510938059..5781709284d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2014-11-29 Jonathan Wakely + + * include/bits/locale_facets/nonio.h (__timepunct): Remove unused + typedef. + (time_get): Likewise. Fix comments. + 2014-11-26 Jonathan Wakely Rainer Orth diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index 3e2cc7feae9..5c1eeb7928b 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -179,7 +179,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: // Types: typedef _CharT __char_type; - typedef basic_string<_CharT> __string_type; typedef __timepunct_cache<_CharT> __cache_type; protected: @@ -374,7 +373,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _CharT char_type; typedef _InIter iter_type; //@} - typedef basic_string<_CharT> __string_type; /// Numpunct facet id. static locale::id id; @@ -393,15 +391,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Return preferred order of month, day, and year. * - * This function returns an enum from timebase::dateorder giving the + * This function returns an enum from time_base::dateorder giving the * preferred ordering if the format @a x given to time_put::put() only * uses month, day, and year. If the format @a x for the associated * locale uses other fields, this function returns - * timebase::dateorder::noorder. + * time_base::dateorder::noorder. * * NOTE: The library always returns noorder at the moment. * - * @return A member of timebase::dateorder. + * @return A member of time_base::dateorder. */ dateorder date_order() const @@ -548,12 +546,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Return preferred order of month, day, and year. * - * This function returns an enum from timebase::dateorder giving the + * This function returns an enum from time_base::dateorder giving the * preferred ordering if the format @a x given to time_put::put() only * uses month, day, and year. This function is a hook for derived * classes to change the value returned. * - * @return A member of timebase::dateorder. + * @return A member of time_base::dateorder. */ virtual dateorder do_date_order() const; -- 2.30.2