fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 11:17:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

added FMT_API declarations where needed when using FMT_EXPORT from a separate dll

Browse Source 
(cherry picked from commit ad6d78f2a8)
This commit is contained in:
Rich E
2017-01-30 14:38:53 -05:00
committed by Jonathan Müller
parent 5bce2c0cef
commit fbd871e433
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fmt/format.cc
View File

@ -911,14 +911,14 @@ template void fmt::internal::FixedBuffer<char>::grow(std::size_t);
template void fmt::internal::ArgMap<char>::init(const fmt::ArgList &args); template void fmt::internal::ArgMap<char>::init(const fmt::ArgList &args);
template void fmt::internal::PrintfFormatter<char>::format( template FMT_API void fmt::internal::PrintfFormatter<char>::format(
BasicWriter<char> &writer, CStringRef format); BasicWriter<char> &writer, CStringRef format);
template int fmt::internal::CharTraits<char>::format_float( template FMT_API int fmt::internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format, char *buffer, std::size_t size, const char *format,
unsigned width, int precision, double value); unsigned width, int precision, double value);
template int fmt::internal::CharTraits<char>::format_float( template FMT_API int fmt::internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format, char *buffer, std::size_t size, const char *format,
unsigned width, int precision, long double value); unsigned width, int precision, long double value);
@ -928,14 +928,14 @@ template void fmt::internal::FixedBuffer<wchar_t>::grow(std::size_t);
template void fmt::internal::ArgMap<wchar_t>::init(const fmt::ArgList &args); template void fmt::internal::ArgMap<wchar_t>::init(const fmt::ArgList &args);
template void fmt::internal::PrintfFormatter<wchar_t>::format( template FMT_API void fmt::internal::PrintfFormatter<wchar_t>::format(
BasicWriter<wchar_t> &writer, WCStringRef format); BasicWriter<wchar_t> &writer, WCStringRef format);
template int fmt::internal::CharTraits<wchar_t>::format_float( template FMT_API int fmt::internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format, wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, double value); unsigned width, int precision, double value);
template int fmt::internal::CharTraits<wchar_t>::format_float( template int FMT_API fmt::internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format, wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, long double value); unsigned width, int precision, long double value);

8
fmt/format.h
View File

@ -583,7 +583,7 @@ class FormatError : public std::runtime_error {
explicit FormatError(CStringRef message) explicit FormatError(CStringRef message)
: std::runtime_error(message.c_str()) {} : std::runtime_error(message.c_str()) {}
FormatError(const FormatError &ferr) : std::runtime_error(ferr) {} FormatError(const FormatError &ferr) : std::runtime_error(ferr) {}
~FormatError() FMT_DTOR_NOEXCEPT; FMT_API ~FormatError() FMT_DTOR_NOEXCEPT;
}; };
namespace internal { namespace internal {
@ -1380,7 +1380,7 @@ class RuntimeError : public std::runtime_error {
protected: protected:
RuntimeError() : std::runtime_error("") {} RuntimeError() : std::runtime_error("") {}
RuntimeError(const RuntimeError &rerr) : std::runtime_error(rerr) {} RuntimeError(const RuntimeError &rerr) : std::runtime_error(rerr) {}
~RuntimeError() FMT_DTOR_NOEXCEPT; FMT_API ~RuntimeError() FMT_DTOR_NOEXCEPT;
}; };
template <typename Char> template <typename Char>
@ -2319,7 +2319,7 @@ inline uint64_t make_type(FMT_GEN15(FMT_ARG_TYPE_DEFAULT)) {
*/ */
class SystemError : public internal::RuntimeError { class SystemError : public internal::RuntimeError {
private: private:
void init(int err_code, CStringRef format_str, ArgList args); FMT_API void init(int err_code, CStringRef format_str, ArgList args);
protected: protected:
int error_code_; int error_code_;
@ -2359,7 +2359,7 @@ class SystemError : public internal::RuntimeError {
} }
FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef) FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef)
~SystemError() FMT_DTOR_NOEXCEPT; FMT_API ~SystemError() FMT_DTOR_NOEXCEPT;
int error_code() const { return error_code_; } int error_code() const { return error_code_; }
}; };