From ab0f2120f6892811b73c6884f35f63054b56518f Mon Sep 17 00:00:00 2001
From: "a.navrotskiy" <navrotskiy@corp.mail.ru>
Date: Wed, 6 Apr 2016 10:42:04 +0300
Subject: [PATCH] Fix Visual Studio compilation with _HAS_EXCEPTIONS=0 (more
 concrete define and better workaround place)

---
 stdcpp.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/stdcpp.h b/stdcpp.h
index d54b53ab..66efc203 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -6,13 +6,6 @@
 #include <intrin.h>
 #endif
 
-#ifdef _MSC_VER
-// Workaround for: https://connect.microsoft.com/VisualStudio/feedback/details/1600701/type-info-does-not-compile-with-has-exceptions-0
-namespace std {
-  using ::type_info;
-}
-#endif
-
 #include <string>
 #include <memory>
 #include <exception>
@@ -27,6 +20,13 @@ namespace std {
 #include <map>
 #include <new>
 
+#if defined(_MSC_VER) && (_MSC_VER < 1900) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 0)
+// Workaround for: https://connect.microsoft.com/VisualStudio/feedback/details/1600701/type-info-does-not-compile-with-has-exceptions-0
+namespace std {
+  using ::type_info;
+}
+#endif
+
 #if _MSC_VER >= 1600
 // for make_unchecked_array_iterator
 #include <iterator>