Merge pull request #52 from jtrmal/gcc_noexcept_fix

C++11 (non)compliance fix

Merge pull request #52 from jtrmal/gcc_noexcept_fix
C++11 (non)compliance fix
b2db2cad · Jan "yenda" Trmal · ec358b98 · 2b85f3f6 · b2db2cad
Commit b2db2cad authored Aug 04, 2015 by Jan "yenda" Trmal
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

src/base/kaldi-error.h src/base/kaldi-error.h +7 -4

No files found.
--- a/src/base/kaldi-error.h
+++ b/src/base/kaldi-error.h
@@ -27,7 +27,10 @@
 #include <sstream>
 #include <cstdio>

-#if _MSC_VER >= 1900 || (!defined(_MSC_VER) && __cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#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)