diff options
| author | Haibo Huang <hhb@google.com> | 2019-12-05 18:51:48 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-12-05 18:51:48 -0800 |
| commit | 289bd9700073441c2086388c1dc85aa3daea4e08 (patch) | |
| tree | 44ba216844db84101d41a89caf81cbf61f5f0dbe /include | |
| parent | 71aa0b1047729072861452eda91eaa957d95c9ce (diff) | |
| parent | 071794ec654a7c503b6214de4032c8ec8a07440b (diff) | |
| download | fmtlib-289bd9700073441c2086388c1dc85aa3daea4e08.tar.gz | |
Upgrade fmtlib to 6.1.1
Test: None
Change-Id: I9c63d6e62c440cffb6914d9edd77bd7632ec1ca2
Diffstat (limited to 'include')
| -rw-r--r-- | include/fmt/core.h | 9 | ||||
| -rw-r--r-- | include/fmt/format.h | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/fmt/core.h b/include/fmt/core.h index 6a0846fc..13d74ba8 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -15,7 +15,7 @@ #include <type_traits> // The fmt library version in the form major * 10000 + minor * 100 + patch. -#define FMT_VERSION 60100 +#define FMT_VERSION 60101 #ifdef __has_feature # define FMT_HAS_FEATURE(x) __has_feature(x) @@ -167,9 +167,9 @@ #if !defined(FMT_HEADER_ONLY) && defined(_WIN32) # ifdef FMT_EXPORT -# define FMT_API __pragma(warning(suppress : 4275)) __declspec(dllexport) +# define FMT_API __declspec(dllexport) # elif defined(FMT_SHARED) -# define FMT_API __pragma(warning(suppress : 4275)) __declspec(dllimport) +# define FMT_API __declspec(dllimport) # define FMT_EXTERN_TEMPLATE_API FMT_API # endif #endif @@ -224,7 +224,7 @@ namespace internal { // A workaround for gcc 4.8 to make void_t work in a SFINAE context. template <typename... Ts> struct void_t_impl { using type = void; }; -void assert_fail(const char* file, int line, const char* message); +FMT_API void assert_fail(const char* file, int line, const char* message); #ifndef FMT_ASSERT # ifdef NDEBUG @@ -1206,7 +1206,6 @@ template <typename Context, typename... Args> class format_arg_store { static constexpr unsigned long long types = is_packed ? internal::encode_types<Context, Args...>() : internal::is_unpacked_bit | num_args; - FMT_DEPRECATED static constexpr unsigned long long TYPES = types; format_arg_store(const Args&... args) : data_{internal::make_arg<is_packed, Context>(args)...} {} diff --git a/include/fmt/format.h b/include/fmt/format.h index 398c2a77..600b0eba 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -1145,10 +1145,11 @@ template <typename Char> class float_writer { if (specs_.format == float_format::exp) { // Insert a decimal point after the first digit and add an exponent. *it++ = static_cast<Char>(*digits_); - if (num_digits_ > 1) *it++ = decimal_point_; - it = copy_str<Char>(digits_ + 1, digits_ + num_digits_, it); int num_zeros = specs_.precision - num_digits_; - if (num_zeros > 0 && specs_.trailing_zeros) + bool trailing_zeros = num_zeros > 0 && specs_.trailing_zeros; + if (num_digits_ > 1 || trailing_zeros) *it++ = decimal_point_; + it = copy_str<Char>(digits_ + 1, digits_ + num_digits_, it); + if (trailing_zeros) it = std::fill_n(it, num_zeros, static_cast<Char>('0')); *it++ = static_cast<Char>(specs_.upper ? 'E' : 'e'); return write_exponent<Char>(full_exp - 1, it); |