From 2def9e4c82e989ea2ffb3ab3998cbec57f9a79a5 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 22 Sep 2018 18:51:32 -0700 Subject: [PATCH] Remove FMT_DTOR_NOEXCEPT --- include/fmt/core.h | 7 ------- include/fmt/posix.h | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/fmt/core.h b/include/fmt/core.h index 3f84d5a1..0e08e83b 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -138,13 +138,6 @@ # endif #endif -// 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_BEGIN_NAMESPACE # if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \ FMT_MSC_VER >= 1900 diff --git a/include/fmt/posix.h b/include/fmt/posix.h index 7bf877b4..f4e3fad7 100644 --- a/include/fmt/posix.h +++ b/include/fmt/posix.h @@ -137,7 +137,7 @@ class buffered_file { buffered_file() FMT_NOEXCEPT : file_(FMT_NULL) {} // Destroys the object closing the file it represents if any. - FMT_API ~buffered_file() FMT_DTOR_NOEXCEPT; + FMT_API ~buffered_file() FMT_NOEXCEPT; private: buffered_file(const buffered_file &) = delete; @@ -223,7 +223,7 @@ class file { } // Destroys the object closing the file it represents if any. - FMT_API ~file() FMT_DTOR_NOEXCEPT; + FMT_API ~file() FMT_NOEXCEPT; // Returns the file descriptor. int descriptor() const FMT_NOEXCEPT { return fd_; }