External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow chrono to work with defined thousands separator

Browse Source 
This allows the 8.1.0 and later chrono.h implementation to work (i.e. do not emit any undefined symbol warnings) if the user has `FMT_STATIC_THOUSANDS_SEPARATOR` defined.  The chrono implementation is relying on this definition of `locale_ref` to be defined.  

Moving the `#ifndef` line to still define `locale_ref` and only select which version of `thousands_sep_impl` gets defined.
This commit is contained in:
Greg Sjaardema 2022-01-03 14:16:31 -07:00 committed by GitHub
parent 1b193e7b37
commit 715d7d2aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/format-inl.h
View File

@ -17,10 +17,7 @@
#include <cstring> // std::memmove #include <cstring> // std::memmove
#include <cwchar> #include <cwchar>
#include <exception> #include <exception>
#include <locale>
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
# include <locale>
#endif
#ifdef _WIN32 #ifdef _WIN32
# include <io.h> // _isatty # include <io.h> // _isatty
@ -96,7 +93,6 @@ inline void fwrite_fully(const void* ptr, size_t size, size_t count,
if (written < count) FMT_THROW(system_error(errno, "cannot write to file")); if (written < count) FMT_THROW(system_error(errno, "cannot write to file"));
} }
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
template <typename Locale> template <typename Locale>
locale_ref::locale_ref(const Locale& loc) : locale_(&loc) { locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
static_assert(std::is_same<Locale, std::locale>::value, ""); static_assert(std::is_same<Locale, std::locale>::value, "");
@ -107,6 +103,7 @@ template <typename Locale> Locale locale_ref::get() const {
return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale(); return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale();
} }
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
template <typename Char> template <typename Char>
FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result<Char> { FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result<Char> {
auto& facet = std::use_facet<std::numpunct<Char>>(loc.get<std::locale>()); auto& facet = std::use_facet<std::numpunct<Char>>(loc.get<std::locale>());