commit 3685cad68c5180e0da2afb7c05bd03422c0fe454
author Billy O'Neal <billy.oneal@gmail.com> Tue May 31 14:52:26 2016 -0700
committer Dominic Hamon <dominichamon@users.noreply.github.com> Tue May 31 14:52:26 2016 -0700
tree 4cc96e018460f2c6810b1ab4e2b86c78f75cffdb
parent 74a278e206f9387dec72ec000436a18bfcb3070e

Added new noexcept macros for VS2013 (#229)

include/benchmark/macros.h

diff --git a/include/benchmark/macros.h b/include/benchmark/macros.h
index 3e9540e..09d13c1 100644
--- a/include/benchmark/macros.h
+++ b/include/benchmark/macros.h
@@ -28,15 +28,23 @@
 # define BENCHMARK_UNUSED __attribute__((unused))
 # define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
 # define BENCHMARK_NOEXCEPT noexcept
+# define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
 #elif defined(_MSC_VER) && !defined(__clang__)
 # define BENCHMARK_UNUSED
 # define BENCHMARK_ALWAYS_INLINE __forceinline
-# define BENCHMARK_NOEXCEPT
+# if _MSC_VER >= 1900
+#  define BENCHMARK_NOEXCEPT noexcept
+#  define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
+# else
+#  define BENCHMARK_NOEXCEPT
+#  define BENCHMARK_NOEXCEPT_OP(x)
+# endif
 # define __func__ __FUNCTION__
 #else
 # define BENCHMARK_UNUSED
 # define BENCHMARK_ALWAYS_INLINE
 # define BENCHMARK_NOEXCEPT
+# define BENCHMARK_NOEXCEPT_OP(x)
 #endif
 
 #if defined(__GNUC__)

src/check.h

diff --git a/src/check.h b/src/check.h
index cb49c49..4572bab 100644
--- a/src/check.h
+++ b/src/check.h
@@ -37,7 +37,7 @@
     return log_;
   }
 
-  BENCHMARK_NORETURN ~CheckHandler() noexcept(false) {
+  BENCHMARK_NORETURN ~CheckHandler() BENCHMARK_NOEXCEPT_OP(false) {
       log_ << std::endl;
       CallAbortHandler();
   }