diff --git a/d0355r1.html b/d0355r1.html index 0392dca..a7ee2cb 100644 --- a/d0355r1.html +++ b/d0355r1.html @@ -31,7 +31,7 @@ Document number: D0355R1

Howard E. Hinnant
-2016-10-09
+2016-10-12

Extending <chrono> to Calendars and Time Zones

@@ -104,7 +104,7 @@ create a Coptic calendar (which knows nothing about the Gregorian calendar), which will convert to and from the Gregorian calendar. This is done by establishing a clear and simple communication channel between calendar systems and the <chrono> library (specifically a -system_clock::time_point with a a precision of days). +system_clock::time_point with a precision of days).

@@ -585,9 +585,9 @@ namespace chrono { // ... // duration stream insertion -template <class CharT, class Traits, class Rep, class Period> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, +template <class charT, class traits, class Rep, class Period> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const duration<Rep, Period>& d); // ... @@ -662,21 +662,21 @@ template <class Duration> gps_time<common_type_t<Duration, seconds>> to_gps_time(tai_time<Duration> t); -template <class CharT, class Traits, class Duration> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp); -template <class CharT, class Traits> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const sys_days& dp); -template <class CharT, class Traits, class Duration> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const utc_time<Duration>& t); -template <class CharT, class Traits, class Duration> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const tai_time<Duration>& t); -template <class CharT, class Traits, class Duration> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const gps_time<Duration>& t); +template <class charT, class traits, class Duration> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const sys_time<Duration>& tp); +template <class charT, class traits> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const sys_days& dp); +template <class charT, class traits, class Duration> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const utc_time<Duration>& t); +template <class charT, class traits, class Duration> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const tai_time<Duration>& t); +template <class charT, class traits, class Duration> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const gps_time<Duration>& t); struct local_t {}; template <class Duration> @@ -684,9 +684,9 @@ template <class Duration> using local_seconds = local_time<seconds>; using local_days = local_time<days>; -template <class CharT, class Traits, class Duration> - basic_ostream<CharT, Traits>& - operator<<(basic_ostream<CharT, Traits>& os, const local_time<Duration>& tp); +template <class charT, class traits, class Duration> + basic_ostream<charT, traits>& + operator<<(basic_ostream<charT, traits>& os, const local_time<Duration>& tp); // civil calendar @@ -706,9 +706,9 @@ constexpr day operator+(const days& x, const day& y) noexcept; constexpr day operator-(const day& x, const days& y) noexcept; constexpr days operator-(const day& x, const day& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const day& d); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const day& d); class month; @@ -724,9 +724,9 @@ constexpr month operator+(const months& x, const month& y) noexcept; constexpr month operator-(const month& x, const months& y) noexcept; constexpr months operator-(const month& x, const month& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const month& m); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const month& m); class year; @@ -742,9 +742,9 @@ constexpr year operator+(const years& x, const year& y) noexcept; constexpr year operator-(const year& x, const years& y) noexcept; constexpr years operator-(const year& x, const year& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year& y); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year& y); class weekday; @@ -756,27 +756,27 @@ constexpr weekday operator+(const days& x, const weekday& y) noexcept constexpr weekday operator-(const weekday& x, const days& y) noexcept; constexpr days operator-(const weekday& x, const weekday& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const weekday& wd); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const weekday& wd); class weekday_indexed; constexpr bool operator==(const weekday_indexed& x, const weekday_indexed& y) noexcept; constexpr bool operator!=(const weekday_indexed& x, const weekday_indexed& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const weekday_indexed& wdi); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const weekday_indexed& wdi); class weekday_last; constexpr bool operator==(const weekday_last& x, const weekday_last& y) noexcept; constexpr bool operator!=(const weekday_last& x, const weekday_last& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const weekday_last& wdl); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const weekday_last& wdl); class month_day; @@ -787,9 +787,9 @@ constexpr bool operator> (const month_day& x, const month_day& y) noe constexpr bool operator<=(const month_day& x, const month_day& y) noexcept; constexpr bool operator>=(const month_day& x, const month_day& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const month_day& md); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const month_day& md); class month_day_last; @@ -800,27 +800,27 @@ constexpr bool operator> (const month_day_last& x, const month_day_last&a constexpr bool operator<=(const month_day_last& x, const month_day_last& y) noexcept; constexpr bool operator>=(const month_day_last& x, const month_day_last& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const month_day_last& mdl); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const month_day_last& mdl); class month_weekday; constexpr bool operator==(const month_weekday& x, const month_weekday& y) noexcept; constexpr bool operator!=(const month_weekday& x, const month_weekday& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const month_weekday& mwd); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const month_weekday& mwd); class month_weekday_last; constexpr bool operator==(const month_weekday_last& x, const month_weekday_last& y) noexcept; constexpr bool operator!=(const month_weekday_last& x, const month_weekday_last& y) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const month_weekday_last& mwdl); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const month_weekday_last& mwdl); class year_month; @@ -839,9 +839,9 @@ constexpr year_month operator+(const year_month& ym, const years& dy) no constexpr year_month operator+(const years& dy, const year_month& ym) noexcept; constexpr year_month operator-(const year_month& ym, const years& dy) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year_month& ym); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year_month& ym); class year_month_day; @@ -859,9 +859,9 @@ constexpr year_month_day operator+(const years& dy, const year_month_day& constexpr year_month_day operator-(const year_month_day& ymd, const months& dm) noexcept; constexpr year_month_day operator-(const year_month_day& ymd, const years& dy) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year_month_day& ymd); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year_month_day& ymd); class year_month_day_last; @@ -879,9 +879,9 @@ constexpr year_month_day_last operator+(const years& dy, const year_month_da constexpr year_month_day_last operator-(const year_month_day_last& ymdl, const months& dm) noexcept; constexpr year_month_day_last operator-(const year_month_day_last& ymdl, const years& dy) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year_month_day_last& ymdl); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year_month_day_last& ymdl); class year_month_weekday; @@ -895,9 +895,9 @@ constexpr year_month_weekday operator+(const years& dy, const year_month_wee constexpr year_month_weekday operator-(const year_month_weekday& ymwd, const months& dm) noexcept; constexpr year_month_weekday operator-(const year_month_weekday& ymwd, const years& dy) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year_month_weekday& ymwdi); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year_month_weekday& ymwdi); class year_month_weekday_last; @@ -911,9 +911,9 @@ constexpr year_month_weekday_last operator+(const years& dy, const year_mont constexpr year_month_weekday_last operator-(const year_month_weekday_last& ymwdl, const months& dm) noexcept; constexpr year_month_weekday_last operator-(const year_month_weekday_last& ymwdl, const years& dy) noexcept; -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const year_month_weekday_last& ymwdl); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const year_month_weekday_last& ymwdl); // civil calendar conventional syntax operators constexpr year_month operator/(const year& y, const month& m) noexcept; @@ -965,21 +965,21 @@ time_of_day<minutes> time_of_day<seconds> time_of_day<duration<Rep, Period>> -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const time_of_day<hours>& t); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<hours>& t); -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const time_of_day<minutes>& t); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<minutes>& t); -template<class CharT, class Traits> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const time_of_day<seconds>& t); +template<class charT, class traits> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<seconds>& t); -template<class CharT, class Traits, class Rep, class Period> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const time_of_day<duration<Rep, Period>>& t); +template<class charT, class traits, class Rep, class Period> + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const time_of_day<duration<Rep, Period>>& t); template <class Rep, class Period> constexpr time_of_day<duration<Rep, Period>> @@ -1043,8 +1043,8 @@ template <class Duration1, class Duration2> operator!=(const zoned_time<Duration1>& x, const zoned_time<Duration2>& y); template <class Duration> - basic_ostream<class CharT, class Traits>& - operator<<(basic_ostream<class CharT, class Traits>& os, const zoned_time<Duration>& t); + basic_ostream<class charT, class traits>& + operator<<(basic_ostream<class charT, class traits>& os, const zoned_time<Duration>& t); // make_zoned @@ -1094,158 +1094,158 @@ template <class Duration> // format -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(const locale& loc, basic_string<class CharT, class Traits> format, +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(const locale& loc, basic_string<class charT, class traits> format, const local_time<Duration>& tp); -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(basic_string<class CharT, class Traits> format, const local_time<Duration>& tp); +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(basic_string<class charT, class traits> format, const local_time<Duration>& tp); -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(const locale& loc, basic_string<class CharT, class Traits> format, +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(const locale& loc, basic_string<class charT, class traits> format, const zoned_time<Duration>& tp); -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(basic_string<class CharT, class Traits> format, const zoned_time<Duration>& tp); +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(basic_string<class charT, class traits> format, const zoned_time<Duration>& tp); -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(const locale& loc, basic_string<class CharT, class Traits> format, +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(const locale& loc, basic_string<class charT, class traits> format, const sys_time<Duration>& tp); -template <class CharT, class Traits, class Duration> - basic_string<class CharT, class Traits> - format(basic_string<class CharT, class Traits> format, const sys_time<Duration>& tp); +template <class charT, class traits, class Duration> + basic_string<class charT, class traits> + format(basic_string<class charT, class traits> format, const sys_time<Duration>& tp); -// const CharT* formats +// const charT* formats -template <class CharT, class Duration> - basic_string<class CharT> - format(const locale& loc, const CharT* format, const local_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const locale& loc, const charT* format, const local_time<Duration>& tp); -template <class CharT, class Duration> - basic_string<class CharT> - format(const CharT* format, const local_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const charT* format, const local_time<Duration>& tp); -template <class CharT, class Duration> - basic_string<class CharT> - format(const locale& loc, const CharT* format, const zoned_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const locale& loc, const charT* format, const zoned_time<Duration>& tp); -template <class CharT, class Duration> - basic_string<class CharT> - format(const CharT* format, const zoned_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const charT* format, const zoned_time<Duration>& tp); -template <class CharT, class Duration> - basic_string<class CharT> - format(const locale& loc, const CharT* format, const sys_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const locale& loc, const charT* format, const sys_time<Duration>& tp); -template <class CharT, class Duration> - basic_string<class CharT> - format(const CharT* format, const sys_time<Duration>& tp); +template <class charT, class Duration> + basic_string<class charT> + format(const charT* format, const sys_time<Duration>& tp); // parse -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp); + parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev); + parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp, + basic_string<charT, traits>& abbrev); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp, + parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev, minutes& offset); + parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp, + basic_string<charT, traits>& abbrev, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp, - minutes& offset, basic_string<CharT, Traits>& abbrev); + parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp, + minutes& offset, basic_string<charT, traits>& abbrev); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp); + parse(const basic_string<charT, traits>& format, local_time<Duration>& tp); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev); + parse(const basic_string<charT, traits>& format, local_time<Duration>& tp, + basic_string<charT, traits>& abbrev); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp, + parse(const basic_string<charT, traits>& format, local_time<Duration>& tp, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev, minutes& offset); + parse(const basic_string<charT, traits>& format, local_time<Duration>& tp, + basic_string<charT, traits>& abbrev, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp, - minutes& offset, basic_string<CharT, Traits>& abbrev); + parse(const basic_string<charT, traits>& format, local_time<Duration>& tp, + minutes& offset, basic_string<charT, traits>& abbrev); -// const CharT* formats +// const charT* formats -template <class Duration, class CharT> +template <class Duration, class charT> unspecified - parse(const CharT* format, sys_time<Duration>& tp); + parse(const charT* format, sys_time<Duration>& tp); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, sys_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev); + parse(const charT* format, sys_time<Duration>& tp, + basic_string<charT, traits>& abbrev); -template <class Duration, class CharT> +template <class Duration, class charT> unspecified - parse(const CharT* format, sys_time<Duration>& tp, + parse(const charT* format, sys_time<Duration>& tp, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, sys_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev, minutes& offset); + parse(const charT* format, sys_time<Duration>& tp, + basic_string<charT, traits>& abbrev, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, sys_time<Duration>& tp, - minutes& offset, basic_string<CharT, Traits>& abbrev); + parse(const charT* format, sys_time<Duration>& tp, + minutes& offset, basic_string<charT, traits>& abbrev); -template <class Duration, class CharT> +template <class Duration, class charT> unspecified - parse(const CharT* format, local_time<Duration>& tp); + parse(const charT* format, local_time<Duration>& tp); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, local_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev); + parse(const charT* format, local_time<Duration>& tp, + basic_string<charT, traits>& abbrev); -template <class Duration, class CharT> +template <class Duration, class charT> unspecified - parse(const CharT* format, local_time<Duration>& tp, + parse(const charT* format, local_time<Duration>& tp, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, local_time<Duration>& tp, - basic_string<CharT, Traits>& abbrev, minutes& offset); + parse(const charT* format, local_time<Duration>& tp, + basic_string<charT, traits>& abbrev, minutes& offset); -template <class Duration, class CharT, class Traits> +template <class Duration, class charT, class traits> unspecified - parse(const CharT* format, local_time<Duration>& tp, - minutes& offset, basic_string<CharT, Traits>& abbrev); + parse(const charT* format, local_time<Duration>& tp, + minutes& offset, basic_string<charT, traits>& abbrev); // leap second support @@ -1321,9 +1321,9 @@ Add new section [time.duration.io] after 20.17.5.9 duration algorithms [time.dur

20.17.5.10 duration stream insertion [time.duration.io]

-template <class CharT, class Traits, class Rep, class Period>
-basic_ostream<CharT, Traits>&
-operator<<(basic_ostream<CharT, Traits>& os,
+template <class charT, class traits, class Rep, class Period>
+basic_ostream<charT, traits>&
+operator<<(basic_ostream<charT, traits>& os,
            const duration<Rep, Period>& d);
@@ -1332,12 +1332,12 @@ operator<<(basic_ostream<CharT, Traits>& os, Effects: Equivalent to: 

-os << d.count() << get_units<CharT>(typename Period::type{});
+os << d.count() << get_units<charT>(typename Period::type{});

-Where get_units<CharT>(typename Period::type{}) is an +Where get_units<charT>(typename Period::type{}) is an exposition-only function which returns a null-terminated string of -CharT which depends on Period::type as follows +charT which depends on Period::type as follows (let period be the type Period::type):

@@ -1368,7 +1368,7 @@ exposition-only function which returns a null-terminated string of

In the list above the use of num and den refer to the static data members of period which are converted to arrays of -CharT using a decimal conversion with no leading zeroes. +charT using a decimal conversion with no leading zeroes.

@@ -1665,9 +1665,9 @@ to_utc_time(gps_time<Duration> t); 
-template <class CharT, class Traits, class Duration>
-basic_ostream<CharT, Traits>&
-operator<<(basic_ostream<CharT, Traits>& os, const utc_time<Duration>& t);
+template <class charT, class traits, class Duration>
+basic_ostream<charT, traits>&
+operator<<(basic_ostream<charT, traits>& os, const utc_time<Duration>& t);

@@ -1785,9 +1785,9 @@ to_tai_time(gps_time<Duration> t); 

-template <class CharT, class Traits, class Duration>
-basic_ostream<CharT, Traits>&
-operator<<(basic_ostream<CharT, Traits>& os, const tai_time<Duration>& t);
+template <class charT, class traits, class Duration>
+basic_ostream<charT, traits>&
+operator<<(basic_ostream<charT, traits>& os, const tai_time<Duration>& t);

@@ -1884,9 +1884,9 @@ to_gps_time(tai_time<Duration> t); 

-template <class CharT, class Traits, class Duration>
-basic_ostream<CharT, Traits>&
-operator<<(basic_ostream<CharT, Traits>& os, const gps_time<Duration>& t);
+template <class charT, class traits, class Duration>
+basic_ostream<charT, traits>&
+operator<<(basic_ostream<charT, traits>& os, const gps_time<Duration>& t);

@@ -8054,58 +8054,58 @@ make_zoned(const string& name, const sys_time<Duration>& st)

20.17.10.7 Formatting [time.timezone.format]

-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(const locale& loc, basic_string<class CharT, class Traits> format,
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(const locale& loc, basic_string<class charT, class traits> format,
        const local_time<Duration>& tp);
 
-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(basic_string<class CharT, class Traits> format, const local_time<Duration>& tp);
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(basic_string<class charT, class traits> format, const local_time<Duration>& tp);
 
-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(const locale& loc, basic_string<class CharT, class Traits> format,
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(const locale& loc, basic_string<class charT, class traits> format,
        const zoned_time<Duration>& tp);
 
-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(basic_string<class CharT, class Traits> format, const zoned_time<Duration>& tp);
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(basic_string<class charT, class traits> format, const zoned_time<Duration>& tp);
 
-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(const locale& loc, basic_string<class CharT, class Traits> format,
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(const locale& loc, basic_string<class charT, class traits> format,
        const sys_time<Duration>& tp);
 
-template <class CharT, class Traits, class Duration>
-basic_string<class CharT, class Traits>
-format(basic_string<class CharT, class Traits> format, const sys_time<Duration>& tp);
+template <class charT, class traits, class Duration>
+basic_string<class charT, class traits>
+format(basic_string<class charT, class traits> format, const sys_time<Duration>& tp);
 
-// const CharT* formats
+// const charT* formats
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const locale& loc, const CharT* format, const local_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const locale& loc, const charT* format, const local_time<Duration>& tp);
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const CharT* format, const local_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const charT* format, const local_time<Duration>& tp);
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const locale& loc, const CharT* format, const zoned_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const locale& loc, const charT* format, const zoned_time<Duration>& tp);
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const CharT* format, const zoned_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const charT* format, const zoned_time<Duration>& tp);
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const locale& loc, const CharT* format, const sys_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const locale& loc, const charT* format, const sys_time<Duration>& tp);
 
-template <class CharT, class Duration>
-basic_string<class CharT>
-format(const CharT* format, const sys_time<Duration>& tp);
+template <class charT, class Duration>
+basic_string<class charT>
+format(const charT* format, const sys_time<Duration>& tp);

@@ -8201,103 +8201,103 @@ or one can pass in both in either order. 

-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp);
+parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev);
+parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp,
+parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp,
       minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev, minutes& offset);
+parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev, minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, sys_time<Duration>& tp,
-      minutes& offset, basic_string<CharT, Traits>& abbrev);
+parse(const basic_string<charT, traits>& format, sys_time<Duration>& tp,
+      minutes& offset, basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp);
+parse(const basic_string<charT, traits>& format, local_time<Duration>& tp);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev);
+parse(const basic_string<charT, traits>& format, local_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp,
+parse(const basic_string<charT, traits>& format, local_time<Duration>& tp,
       minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev, minutes& offset);
+parse(const basic_string<charT, traits>& format, local_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev, minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const basic_string<CharT, Traits>& format, local_time<Duration>& tp,
-      minutes& offset, basic_string<CharT, Traits>& abbrev);
+parse(const basic_string<charT, traits>& format, local_time<Duration>& tp,
+      minutes& offset, basic_string<charT, traits>& abbrev);
 
-// const CharT* formats
+// const charT* formats
 
-template <class Duration, class CharT>
+template <class Duration, class charT>
 unspecified
-parse(const CharT* format, sys_time<Duration>& tp);
+parse(const charT* format, sys_time<Duration>& tp);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, sys_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev);
+parse(const charT* format, sys_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT>
+template <class Duration, class charT>
 unspecified
-parse(const CharT* format, sys_time<Duration>& tp,
+parse(const charT* format, sys_time<Duration>& tp,
       minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, sys_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev, minutes& offset);
+parse(const charT* format, sys_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev, minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, sys_time<Duration>& tp,
-      minutes& offset, basic_string<CharT, Traits>& abbrev);
+parse(const charT* format, sys_time<Duration>& tp,
+      minutes& offset, basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT>
+template <class Duration, class charT>
 unspecified
-parse(const CharT* format, local_time<Duration>& tp);
+parse(const charT* format, local_time<Duration>& tp);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, local_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev);
+parse(const charT* format, local_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev);
 
-template <class Duration, class CharT>
+template <class Duration, class charT>
 unspecified
-parse(const CharT* format, local_time<Duration>& tp,
+parse(const charT* format, local_time<Duration>& tp,
       minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, local_time<Duration>& tp,
-      basic_string<CharT, Traits>& abbrev, minutes& offset);
+parse(const charT* format, local_time<Duration>& tp,
+      basic_string<charT, traits>& abbrev, minutes& offset);
 
-template <class Duration, class CharT, class Traits>
+template <class Duration, class charT, class traits>
 unspecified
-parse(const CharT* format, local_time<Duration>& tp,
-      minutes& offset, basic_string<CharT, Traits>& abbrev);
+parse(const charT* format, local_time<Duration>& tp,
+      minutes& offset, basic_string<charT, traits>& abbrev);