From ad6d78f2a8b294fab16fc78f0249d374bd6a94a5 Mon Sep 17 00:00:00 2001 From: Rich E Date: Mon, 30 Jan 2017 14:38:53 -0500 Subject: [PATCH] added FMT_API declarations where needed when using FMT_EXPORT from a separate dll --- fmt/format.cc | 8 ++++---- fmt/format.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fmt/format.cc b/fmt/format.cc index b2bb7687..c349e00e 100644 --- a/fmt/format.cc +++ b/fmt/format.cc @@ -513,11 +513,11 @@ template void internal::FixedBuffer::grow(std::size_t); template void internal::ArgMap::init(const ArgList &args); -template int internal::CharTraits::format_float( +template FMT_API int internal::CharTraits::format_float( char *buffer, std::size_t size, const char *format, unsigned width, int precision, double value); -template int internal::CharTraits::format_float( +template FMT_API int internal::CharTraits::format_float( char *buffer, std::size_t size, const char *format, unsigned width, int precision, long double value); @@ -527,11 +527,11 @@ template void internal::FixedBuffer::grow(std::size_t); template void internal::ArgMap::init(const ArgList &args); -template int internal::CharTraits::format_float( +template FMT_API int internal::CharTraits::format_float( wchar_t *buffer, std::size_t size, const wchar_t *format, unsigned width, int precision, double value); -template int internal::CharTraits::format_float( +template FMT_API int internal::CharTraits::format_float( wchar_t *buffer, std::size_t size, const wchar_t *format, unsigned width, int precision, long double value); diff --git a/fmt/format.h b/fmt/format.h index ea49eef0..4ba63b58 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -606,7 +606,7 @@ class FormatError : public std::runtime_error { explicit FormatError(CStringRef message) : std::runtime_error(message.c_str()) {} FormatError(const FormatError &ferr) : std::runtime_error(ferr) {} - ~FormatError() FMT_DTOR_NOEXCEPT; + FMT_API ~FormatError() FMT_DTOR_NOEXCEPT; }; namespace internal { @@ -1448,7 +1448,7 @@ class RuntimeError : public std::runtime_error { protected: RuntimeError() : std::runtime_error("") {} RuntimeError(const RuntimeError &rerr) : std::runtime_error(rerr) {} - ~RuntimeError() FMT_DTOR_NOEXCEPT; + FMT_API ~RuntimeError() FMT_DTOR_NOEXCEPT; }; template @@ -2374,7 +2374,7 @@ inline uint64_t make_type(FMT_GEN15(FMT_ARG_TYPE_DEFAULT)) { */ class SystemError : public internal::RuntimeError { private: - void init(int err_code, CStringRef format_str, ArgList args); + FMT_API void init(int err_code, CStringRef format_str, ArgList args); protected: int error_code_; @@ -2407,7 +2407,7 @@ class SystemError : public internal::RuntimeError { } FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef) - ~SystemError() FMT_DTOR_NOEXCEPT; + FMT_API ~SystemError() FMT_DTOR_NOEXCEPT; int error_code() const { return error_code_; } };