From ef7d4879e477914417e11ac27cc7a3ceea2b00f7 Mon Sep 17 00:00:00 2001 From: Naios Date: Wed, 18 Mar 2015 10:34:47 +0100 Subject: [PATCH] Fix build under g++-4.9, SunOS 5.11 i386 i86pc Solaris * thanks @VolodymyrLavrenchuk for pointing this out. --- format.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/format.cc b/format.cc index 25836ea1..86fac25a 100644 --- a/format.cc +++ b/format.cc @@ -226,14 +226,14 @@ void format_error_code(fmt::Writer &out, int error_code, // bad_alloc. out.clear(); static const char SEP[] = ": "; - static const char ERR[] = "error "; + static const char _ERR[] = "error "; fmt::internal::IntTraits::MainType ec_value = error_code; - // Subtract 2 to account for terminating null characters in SEP and ERR. + // Subtract 2 to account for terminating null characters in SEP and _ERR. std::size_t error_code_size = - sizeof(SEP) + sizeof(ERR) + fmt::internal::count_digits(ec_value) - 2; + sizeof(SEP) + sizeof(_ERR) + fmt::internal::count_digits(ec_value) - 2; if (message.size() <= fmt::internal::INLINE_BUFFER_SIZE - error_code_size) out << message << SEP; - out << ERR << error_code; + out << _ERR << error_code; assert(out.size() <= fmt::internal::INLINE_BUFFER_SIZE); }