Skip to content
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

Fix Visual Studio error due to alternate syntactic form of noreturn #3018

Merged
merged 1 commit into from
Feb 1, 2019
Merged

Fix Visual Studio error due to alternate syntactic form of noreturn #3018

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
2 changes: 1 addition & 1 deletion src/base/kaldi-error.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ FatalMessageLogger::FatalMessageLogger(LogMessageEnvelope::Severity severity,
}
}

[[ noreturn ]] FatalMessageLogger::~FatalMessageLogger() noexcept(false) {
FatalMessageLogger::~FatalMessageLogger [[ noreturn ]] () noexcept(false) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daanzu would you mind making a PR to make it more like the following, so we can support both compiler versions? Obviously test that it works first.

#if defined(_MSC_VER)
FatalMessageLogger::~FatalMessageLogger [[ noreturn ]] () noexcept(false) 
#else
[[noreturn]] FatalMessageLogger::~FatalMessageLogger () noexcept(false) 
#endif
{

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

std::string str = GetMessage();

// print the mesage (or send to logging handler),
Expand Down