diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-27 00:31:03 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-27 00:31:03 +0200 |
| commit | 6a68315e938eb2611806658828ecea86805822e7 (patch) | |
| tree | 5ff552cf0e6bac9a35bedaf544cb19332663fa70 /apt-pkg/contrib/strutl.cc | |
| parent | 75d238ba66576c04f257e9d7c0a6995721f1441d (diff) | |
| parent | 01d207a5076b6fc37a064645b13f2c6550f58b94 (diff) | |
Merge branch 'portability/freebsd'
Diffstat (limited to 'apt-pkg/contrib/strutl.cc')
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 6c72859d4..66b0078dc 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -21,6 +21,7 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> +#include <array> #include <algorithm> #include <iomanip> #include <locale> @@ -758,7 +759,7 @@ string TimeRFC1123(time_t Date, bool const NumericTimezone) if (gmtime_r(&Date, &Conv) == NULL) return ""; - auto const posix = std::locale("C.UTF-8"); + auto const posix = std::locale::classic(); std::ostringstream datestr; datestr.imbue(posix); APT::StringView const fmt("%a, %d %b %Y %H:%M:%S"); @@ -945,7 +946,7 @@ bool RFC1123StrToTime(const char* const str,time_t &time) signed int year = 0; // yes, Y23K problem – we gonna worry then… std::string weekday, month, datespec, timespec, zone; std::istringstream ss(str); - auto const &posix = std::locale("C.UTF-8"); + auto const &posix = std::locale::classic(); ss.imbue(posix); ss >> weekday; // we only superficially check weekday, mostly to avoid accepting localized |