]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Populate generic std::time_get's wide %c format [PR117135]
authorJonathan Wakely <jwakely@redhat.com>
Tue, 24 Sep 2024 22:20:56 +0000 (23:20 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Mon, 14 Oct 2024 15:48:49 +0000 (16:48 +0100)
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.

libstdc++-v3/config/locale/generic/time_members.cc

index 6619f0ca881a6c1f948d96e858addfc8db4bf1e9..5012a270dd1a512fef4c9d8d034e4bade267f987 100644 (file)
@@ -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";