feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Remove use_grisu

Browse Source
This commit is contained in:
Victor Zverovich
2018-10-17 17:01:22 -07:00
parent 847abb6f8f
commit b71d3fe7ab
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/format.h
View File

@ -163,6 +163,7 @@ FMT_END_NAMESPACE
#ifndef FMT_USE_GRISU #ifndef FMT_USE_GRISU
# define FMT_USE_GRISU 0 # define FMT_USE_GRISU 0
//# define FMT_USE_GRISU std::numeric_limits<double>::is_iec559
#endif #endif
// __builtin_clz is broken in clang with Microsoft CodeGen: // __builtin_clz is broken in clang with Microsoft CodeGen:
@ -1177,10 +1178,6 @@ FMT_CONSTEXPR unsigned basic_parse_context<Char, ErrorHandler>::next_arg_id() {
namespace internal { namespace internal {
inline bool use_grisu() {
return FMT_USE_GRISU && std::numeric_limits<double>::is_iec559;
}
// Formats value using Grisu2 algorithm: // Formats value using Grisu2 algorithm:
// https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf // https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf
template <typename Double> template <typename Double>
@ -2841,7 +2838,7 @@ void basic_writer<Range>::write_double(T value, const format_specs &spec) {
return write_inf_or_nan(handler.upper ? "INF" : "inf"); return write_inf_or_nan(handler.upper ? "INF" : "inf");
memory_buffer buffer; memory_buffer buffer;
bool use_grisu = internal::use_grisu() && sizeof(T) <= sizeof(double) && bool use_grisu = FMT_USE_GRISU && sizeof(T) <= sizeof(double) &&
spec.type != 'a' && spec.type != 'A' && spec.type != 'a' && spec.type != 'A' &&
internal::grisu2_format(static_cast<double>(value), buffer, spec); internal::grisu2_format(static_cast<double>(value), buffer, spec);
if (!use_grisu) { if (!use_grisu) {

2
test/format-test.cc
View File

@ -996,7 +996,7 @@ TEST(FormatterTest, HashFlag) {
EXPECT_EQ("0x42", format("{0:#x}", 0x42ull)); EXPECT_EQ("0x42", format("{0:#x}", 0x42ull));
EXPECT_EQ("042", format("{0:#o}", 042ull)); EXPECT_EQ("042", format("{0:#o}", 042ull));
if (fmt::internal::use_grisu()) if (FMT_USE_GRISU)
EXPECT_EQ("-42.0", format("{0:#}", -42.0)); EXPECT_EQ("-42.0", format("{0:#}", -42.0));
else else
EXPECT_EQ("-42.0000", format("{0:#}", -42.0)); EXPECT_EQ("-42.0000", format("{0:#}", -42.0));