aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <lloyd@randombit.net>2016-02-20 05:23:22 -0500
committerJack Lloyd <lloyd@randombit.net>2016-02-20 05:23:22 -0500
commit1b5b1d603df11c603a3fdbcb92ad26ba459677f2 (patch)
treec5a083a72d51007a22ac893562b7c5d2cb340033
parent66f7e6ec370b0c6fad29ccb2966275e311939228 (diff)
parent6bb506e47b1875c695559a75a94bd6e1377d206a (diff)
Merge GH #429 Enable noexcept in VS 2015
-rw-r--r--src/build-data/buildh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 52ba2b55c..a1d8890db 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -265,7 +265,7 @@ softare-based entropy polling is still used.
#define BOTAN_DEPRECATED(msg)
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
// noexcept is not supported in VS 2013
#include <yvals.h>
#define BOTAN_NOEXCEPT _NOEXCEPT