Fix Visual Studio compilation with _HAS_EXCEPTIONS=0 (more concrete define and better workaround place)
parent
9b5894be39
commit
ab0f2120f6
14
stdcpp.h
14
stdcpp.h
|
|
@ -6,13 +6,6 @@
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
#endif
|
#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 <string>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
|
@ -27,6 +20,13 @@ namespace std {
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <new>
|
#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
|
#if _MSC_VER >= 1600
|
||||||
// for make_unchecked_array_iterator
|
// for make_unchecked_array_iterator
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue