diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-09-24 23:20:56 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2024-10-14 16:48:49 +0100 |
| commit | 707d84efee7f7eb5a336935f386e094402f267a6 (patch) | |
| tree | 7b18a16cfd601053337718ffe05eb69d85f0d6c6 | |
| parent | 0515b2436b7c7e5e391eae7edc42173c52bab61d (diff) | |
| download | gcc-707d84efee7f7eb5a336935f386e094402f267a6.zip gcc-707d84efee7f7eb5a336935f386e094402f267a6.tar.gz gcc-707d84efee7f7eb5a336935f386e094402f267a6.tar.bz2 | |
libstdc++: Populate generic std::time_get's wide %c format [PR117135]
I missed out the __timepunct<wchar_t> specialization for the "generic"
implementation when defining the %c format in r15-4016-gc534e37faccf48.
libstdc++-v3/ChangeLog:
PR libstdc++/117135
* config/locale/generic/time_members.cc
(__timepunct<wchar_t>::_M_initialize_timepunc): Set
_M_date_time_format for C locale. Set %Ex formats to the same
values as the %x formats.
| -rw-r--r-- | libstdc++-v3/config/locale/generic/time_members.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc index 6619f0c..5012a27 100644 --- a/libstdc++-v3/config/locale/generic/time_members.cc +++ b/libstdc++-v3/config/locale/generic/time_members.cc @@ -150,11 +150,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = new __timepunct_cache<wchar_t>; _M_data->_M_date_format = L"%m/%d/%y"; - _M_data->_M_date_era_format = L"%m/%d/%y"; + _M_data->_M_date_era_format = _M_data->_M_date_format; _M_data->_M_time_format = L"%H:%M:%S"; - _M_data->_M_time_era_format = L"%H:%M:%S"; - _M_data->_M_date_time_format = L""; - _M_data->_M_date_time_era_format = L""; + _M_data->_M_time_era_format = _M_data->_M_time_format; + _M_data->_M_date_time_format = L"%a %b %e %T %Y"; + _M_data->_M_date_time_era_format = _M_data->_M_date_time_format; _M_data->_M_am = L"AM"; _M_data->_M_pm = L"PM"; _M_data->_M_am_pm_format = L"%I:%M:%S %p"; |