File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -560,8 +560,8 @@ RAPIDJSON_NAMESPACE_END
560
560
#ifndef RAPIDJSON_HAS_CXX11_NOEXCEPT
561
561
#if defined(__clang__)
562
562
#define RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature (cxx_noexcept)
563
- #elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
564
- // (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
563
+ #elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
564
+ (defined(_MSC_VER) && _MSC_VER >= 1900 )
565
565
#define RAPIDJSON_HAS_CXX11_NOEXCEPT 1
566
566
#else
567
567
#define RAPIDJSON_HAS_CXX11_NOEXCEPT 0
@@ -575,8 +575,12 @@ RAPIDJSON_NAMESPACE_END
575
575
576
576
// no automatic detection, yet
577
577
#ifndef RAPIDJSON_HAS_CXX11_TYPETRAITS
578
+ #if (defined(_MSC_VER) && _MSC_VER >= 1700)
579
+ #define RAPIDJSON_HAS_CXX11_TYPETRAITS 1
580
+ #else
578
581
#define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
579
582
#endif
583
+ #endif
580
584
581
585
#ifndef RAPIDJSON_HAS_CXX11_RANGE_FOR
582
586
#if defined(__clang__)
You can’t perform that action at this time.
0 commit comments