generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-18 19:37:35 +02:00
Code Issues Projects Releases Wiki Activity

ENH: Remove conditionals for unsupported VS compilers

Browse Source 
Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported
compiler with sufficient C++11 capabilities

See:
https://blogs.msdn.microsoft.com/vcblog/2013/12/02/c1114-core-language-features-in-vs-2013-and-the-nov-2013-ctp/
for details related to language features supported.
This commit is contained in:
Hans Johnson 2019-01-11 14:13:08 -06:00 committed by Hans Johnson
parent 2853b1cdac
commit 31d65711d6
6 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doxyfile.in
View File

@ -1944,7 +1944,7 @@ INCLUDE_FILE_PATTERNS = *.h
# recursively expanded use the := operator instead of the = operator. # recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = "_MSC_VER=1400" \ PREDEFINED = "_MSC_VER=1800" \
_CPPRTTI \ _CPPRTTI \
_WIN32 \ _WIN32 \
JSONCPP_DOC_EXCLUDE_IMPLEMENTATION JSONCPP_DOC_EXCLUDE_IMPLEMENTATION

2
doc/web_doxyfile.in
View File

@ -1932,7 +1932,7 @@ INCLUDE_FILE_PATTERNS = *.h
# recursively expanded use the := operator instead of the = operator. # recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = "_MSC_VER=1400" \ PREDEFINED = "_MSC_VER=1800" \
_CPPRTTI \ _CPPRTTI \
_WIN32 \ _WIN32 \
JSONCPP_DOC_EXCLUDE_IMPLEMENTATION JSONCPP_DOC_EXCLUDE_IMPLEMENTATION

29
include/json/config.h
View File

@ -54,6 +54,10 @@
#define JSON_API #define JSON_API
#endif #endif
#if defined(_MSC_VER) && _MSC_VER < 1800
#error "ERROR: Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900 #if defined(_MSC_VER) && _MSC_VER < 1900
// As recommended at https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 // As recommended at https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
extern JSON_API int msvc_pre1900_c99_snprintf(char *outBuf, size_t size, const char *format, ...); extern JSON_API int msvc_pre1900_c99_snprintf(char *outBuf, size_t size, const char *format, ...);
@ -68,22 +72,7 @@
// #define JSON_NO_INT64 1 // #define JSON_NO_INT64 1
#if defined(_MSC_VER) // MSVC #if defined(_MSC_VER) // MSVC
#if _MSC_VER <= 1200 // MSVC 6
// Microsoft Visual Studio 6 only support conversion from __int64 to double
// (no conversion from unsigned __int64).
#define JSON_USE_INT64_DOUBLE_CONVERSION 1
// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
// characters in the debug information)
// All projects I've ever seen with VS6 were using this globally (not bothering
// with pragma push/pop).
#pragma warning(disable : 4786)
#endif // MSVC 6
#if _MSC_VER >= 1500 // MSVC 2008
/// Indicates that the following function is deprecated.
#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) #define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
#endif
#endif // defined(_MSC_VER) #endif // defined(_MSC_VER)
// In c++11 the override keyword allows you to explicitly define that a function // In c++11 the override keyword allows you to explicitly define that a function
@ -93,13 +82,9 @@
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
#define JSONCPP_NOEXCEPT noexcept #define JSONCPP_NOEXCEPT noexcept
#define JSONCPP_OP_EXPLICIT explicit #define JSONCPP_OP_EXPLICIT explicit
#elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900 #elif defined(_MSC_VER) && _MSC_VER < 1900
#define JSONCPP_NOEXCEPT throw() #define JSONCPP_NOEXCEPT throw()
#if _MSC_VER >= 1800 // MSVC 2013
#define JSONCPP_OP_EXPLICIT explicit #define JSONCPP_OP_EXPLICIT explicit
#else
#define JSONCPP_OP_EXPLICIT
#endif
#elif defined(_MSC_VER) && _MSC_VER >= 1900 #elif defined(_MSC_VER) && _MSC_VER >= 1900
#define JSONCPP_NOEXCEPT noexcept #define JSONCPP_NOEXCEPT noexcept
#define JSONCPP_OP_EXPLICIT explicit #define JSONCPP_OP_EXPLICIT explicit
@ -110,9 +95,9 @@
#ifndef JSON_HAS_RVALUE_REFERENCES #ifndef JSON_HAS_RVALUE_REFERENCES
#if defined(_MSC_VER) && _MSC_VER >= 1600 // MSVC >= 2010 #if defined(_MSC_VER)
#define JSON_HAS_RVALUE_REFERENCES 1 #define JSON_HAS_RVALUE_REFERENCES 1
#endif // MSVC >= 2010 #endif // MSVC >= 2013
#ifdef __clang__ #ifdef __clang__
#if __has_feature(cxx_rvalue_references) #if __has_feature(cxx_rvalue_references)

2
src/lib_json/json_reader.cpp
View File

@ -34,7 +34,7 @@
#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES #endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
#endif //_MSC_VER #endif //_MSC_VER
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 #if defined(_MSC_VER)
// Disable warning about strdup being deprecated. // Disable warning about strdup being deprecated.
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif

2
src/lib_json/json_value.cpp
View File

@ -43,7 +43,7 @@ int JSON_API msvc_pre1900_c99_snprintf(char *outBuf, size_t size, const char *fo
#endif #endif
// Disable warning C4702 : unreachable code // Disable warning C4702 : unreachable code
#if defined(_MSC_VER) && _MSC_VER >= 1800 // VC++ 12.0 and above #if defined(_MSC_VER)
#pragma warning(disable : 4702) #pragma warning(disable : 4702)
#endif #endif

2
src/lib_json/json_writer.cpp
View File

@ -76,7 +76,7 @@
#endif #endif
#endif #endif
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 #if defined(_MSC_VER)
// Disable warning about strdup being deprecated. // Disable warning about strdup being deprecated.
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif