Skip to content

Remove pre-C++11 compatibility for noexcept. #2656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 1 commit into from
Aug 30, 2018
Merged

Remove pre-C++11 compatibility for noexcept. #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/base/kaldi-error.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down
16 changes: 2 additions & 14 deletions src/base/kaldi-error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,"',
Expand All @@ -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,
Expand Down