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

fix newer clang warnings

Browse Source
This commit is contained in:
Lectem
2016-10-30 14:55:28 +01:00
committed by Victor Zverovich
parent e599fe7436
commit 8f455c10b0
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fmt/format.cc
View File

@ -81,9 +81,9 @@ static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
namespace fmt { namespace fmt {
FMT_FUNC internal::RuntimeError::~RuntimeError() throw() {} FMT_FUNC internal::RuntimeError::~RuntimeError() FMT_DTOR_NOEXCEPT {}
FMT_FUNC FormatError::~FormatError() throw() {} FMT_FUNC FormatError::~FormatError() FMT_DTOR_NOEXCEPT {}
FMT_FUNC SystemError::~SystemError() throw() {} FMT_FUNC SystemError::~SystemError() FMT_DTOR_NOEXCEPT {}
namespace { namespace {

35
fmt/format.h
View File

@ -180,22 +180,32 @@ typedef __int64 intmax_t;
# define FMT_USE_NOEXCEPT 0 # define FMT_USE_NOEXCEPT 0
#endif #endif
#ifndef FMT_NOEXCEPT #if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
# if FMT_EXCEPTIONS
# if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \ (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \
FMT_MSC_VER >= 1900 FMT_MSC_VER >= 1900
# define FMT_NOEXCEPT noexcept # define FMT_DETECTED_NOEXCEPT noexcept
# else #else
# define FMT_NOEXCEPT throw() # define FMT_DETECTED_NOEXCEPT throw()
# endif #endif
#ifndef FMT_NOEXCEPT
# if FMT_EXCEPTIONS
# define FMT_NOEXCEPT FMT_DETECTED_NOEXCEPT
# else # else
# define FMT_NOEXCEPT # define FMT_NOEXCEPT
# endif # endif
#endif #endif
// This is needed because GCC still uses throw() in its headers when exceptions
// are disabled.
#if FMT_GCC_VERSION
# define FMT_DTOR_NOEXCEPT FMT_DETECTED_NOEXCEPT
#else
# define FMT_DTOR_NOEXCEPT FMT_NOEXCEPT
#endif
#ifndef FMT_OVERRIDE #ifndef FMT_OVERRIDE
# if FMT_USE_OVERRIDE || FMT_HAS_FEATURE(cxx_override) || \ # if (defined(FMT_USE_OVERRIDE) && FMT_USE_OVERRIDE) || FMT_HAS_FEATURE(cxx_override) || \
(FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \ (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || \
FMT_MSC_VER >= 1900 FMT_MSC_VER >= 1900
# define FMT_OVERRIDE override # define FMT_OVERRIDE override
@ -204,7 +214,6 @@ typedef __int64 intmax_t;
# endif # endif
#endif #endif
// A macro to disallow the copy constructor and operator= functions // A macro to disallow the copy constructor and operator= functions
// This should be used in the private: declarations for a class // This should be used in the private: declarations for a class
#ifndef FMT_USE_DELETED_FUNCTIONS #ifndef FMT_USE_DELETED_FUNCTIONS
@ -550,7 +559,8 @@ class FormatError : public std::runtime_error {
public: public:
explicit FormatError(CStringRef message) explicit FormatError(CStringRef message)
: std::runtime_error(message.c_str()) {} : std::runtime_error(message.c_str()) {}
~FormatError() throw(); FormatError(const FormatError &ferr) : std::runtime_error(ferr) {}
~FormatError() FMT_DTOR_NOEXCEPT;
}; };
namespace internal { namespace internal {
@ -1376,7 +1386,8 @@ struct NamedArgWithType : NamedArg<Char> {
class RuntimeError : public std::runtime_error { class RuntimeError : public std::runtime_error {
protected: protected:
RuntimeError() : std::runtime_error("") {} RuntimeError() : std::runtime_error("") {}
~RuntimeError() throw(); RuntimeError(const RuntimeError &rerr) : std::runtime_error(rerr) {}
~RuntimeError() FMT_DTOR_NOEXCEPT;
}; };
template <typename Char> template <typename Char>
@ -2325,7 +2336,7 @@ class SystemError : public internal::RuntimeError {
} }
FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef) FMT_VARIADIC_CTOR(SystemError, init, int, CStringRef)
~SystemError() throw(); ~SystemError() FMT_DTOR_NOEXCEPT;
int error_code() const { return error_code_; } int error_code() const { return error_code_; }
}; };