OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nonio.h (__timepunct): Remove unused typedef. 

* include/bits/locale_facets/nonio.h (__timepunct): Remove unused
	typedef.
	(time_get): Likewise. Fix comments.

From-SVN: r218183
This commit is contained in:
Jonathan Wakely 2014-11-29 22:58:33 +00:00 committed by Jonathan Wakely
parent 925f3e6546
commit bd6757b8d3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-29 Jonathan Wakely <jwakely@redhat.com>
* include/bits/locale_facets/nonio.h (__timepunct): Remove unused
typedef.
(time_get): Likewise. Fix comments.
2014-11-26 Jonathan Wakely <jwakely@redhat.com> 2014-11-26 Jonathan Wakely <jwakely@redhat.com>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>

12
libstdc++-v3/include/bits/locale_facets_nonio.h
View File

@ -179,7 +179,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
public: public:
// Types: // Types:
typedef _CharT __char_type; typedef _CharT __char_type;
typedef basic_string<_CharT> __string_type;
typedef __timepunct_cache<_CharT> __cache_type; typedef __timepunct_cache<_CharT> __cache_type;
protected: protected:
@ -374,7 +373,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _CharT char_type; typedef _CharT char_type;
typedef _InIter iter_type; typedef _InIter iter_type;
//@} //@}
typedef basic_string<_CharT> __string_type;
/// Numpunct facet id. /// Numpunct facet id.
static locale::id id; static locale::id id;
@ -393,15 +391,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return preferred order of month, day, and year. * @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 * 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 * uses month, day, and year. If the format @a x for the associated
* locale uses other fields, this function returns * locale uses other fields, this function returns
* timebase::dateorder::noorder. * time_base::dateorder::noorder.
* *
* NOTE: The library always returns noorder at the moment. * NOTE: The library always returns noorder at the moment.
* *
* @return A member of timebase::dateorder. * @return A member of time_base::dateorder.
*/ */
dateorder dateorder
date_order() const date_order() const
@ -548,12 +546,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return preferred order of month, day, and year. * @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 * 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 * uses month, day, and year. This function is a hook for derived
* classes to change the value returned. * classes to change the value returned.
* *
* @return A member of timebase::dateorder. * @return A member of time_base::dateorder.
*/ */
virtual dateorder virtual dateorder
do_date_order() const; do_date_order() const;