From 19ecee155f5eecb88a471bb72915630cf0aee173 Mon Sep 17 00:00:00 2001 From: Daniel Galvez Date: Wed, 29 Aug 2018 20:41:14 -0700 Subject: [PATCH] Remove pre-C++11 compatibility for noexcept. --- src/base/kaldi-error.cc | 4 ++-- src/base/kaldi-error.h | 16 ++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/base/kaldi-error.cc b/src/base/kaldi-error.cc index bb62024a561..dbe955bd86b 100644 --- a/src/base/kaldi-error.cc +++ b/src/base/kaldi-error.cc @@ -147,7 +147,7 @@ MessageLogger::MessageLogger(LogMessageEnvelope::Severity severity, } -MessageLogger::~MessageLogger() KALDI_NOEXCEPT(false) { +MessageLogger::~MessageLogger() noexcept(false) { // remove trailing '\n', std::string str = ss_.str(); while (!str.empty() && str[str.length() - 1] == '\n') @@ -204,7 +204,7 @@ void MessageLogger::HandleMessage(const LogMessageEnvelope &envelope, } } -FatalMessageLogger::~FatalMessageLogger() KALDI_NOEXCEPT(false) { +FatalMessageLogger::~FatalMessageLogger() noexcept(false) { // remove trailing '\n', std::string str = ss_.str(); while (!str.empty() && str[str.length() - 1] == '\n') diff --git a/src/base/kaldi-error.h b/src/base/kaldi-error.h index ab2ab266f6d..5b610edca9d 100644 --- a/src/base/kaldi-error.h +++ b/src/base/kaldi-error.h @@ -33,18 +33,6 @@ #include "base/kaldi-utils.h" /* Important that this file does not depend on any other kaldi headers. */ -// By adding 'KALDI_NOEXCEPT(bool)' immediately after function declaration, -// we can tell the compiler that the function must-not produce -// exceptions (true), or may produce exceptions (false): -#if _MSC_VER >= 1900 || (!defined(_MSC_VER) && __cplusplus >= 201103L) -#define KALDI_NOEXCEPT(Predicate) noexcept((Predicate)) -#elif defined(__GXX_EXPERIMENTAL_CXX0X__) && \ - (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6) -#define KALDI_NOEXCEPT(Predicate) noexcept((Predicate)) -#else -#define KALDI_NOEXCEPT(Predicate) -#endif - #ifdef _MSC_VER #define __func__ __FUNCTION__ #endif @@ -108,7 +96,7 @@ class MessageLogger { /// Destructor, calls 'HandleMessage' which prints the message, /// (since C++11 a 'throwing' destructor must be declared 'noexcept(false)') - ~MessageLogger() KALDI_NOEXCEPT(false); + ~MessageLogger() noexcept(false); /// The hook for the 'insertion operator', e.g. /// 'KALDI_LOG << "Message,"', @@ -128,7 +116,7 @@ class FatalMessageLogger: public MessageLogger { const char *func, const char *file, int32 line): MessageLogger(severity, func, file, line) {} - [[ noreturn ]] ~FatalMessageLogger() KALDI_NOEXCEPT(false); + [[ noreturn ]] ~FatalMessageLogger() noexcept(false); }; // The definition of the logging macros,