From 6606971aae62e1ab2c946c51acd3ad0ae2b96d4a Mon Sep 17 00:00:00 2001 From: vitaut Date: Wed, 18 Nov 2015 08:42:09 -0800 Subject: [PATCH] Improve compatibility with bcc32 --- format.cc | 4 ++-- format.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/format.cc b/format.cc index 08064ac1..9c7fcf2f 100644 --- a/format.cc +++ b/format.cc @@ -744,7 +744,7 @@ FMT_FUNC void fmt::internal::format_windows_error( } } } FMT_CATCH(...) {} - format_error_code(out, error_code, message); + fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32. } #endif // FMT_USE_WINDOWS_H @@ -767,7 +767,7 @@ FMT_FUNC void fmt::internal::format_system_error( buffer.resize(buffer.size() * 2); } } FMT_CATCH(...) {} - format_error_code(out, error_code, message); + fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32. } template diff --git a/format.h b/format.h index 8de1a0ea..d47cae15 100644 --- a/format.h +++ b/format.h @@ -1412,7 +1412,7 @@ class BasicFormatter : private internal::FormatterBase { FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter); - using FormatterBase::get_arg; + using internal::FormatterBase::get_arg; // Checks if manual indexing is used and returns the argument with // specified name.