From 8b31c6f0fdf9de5b5295f395c5cec55aedbfa0a8 Mon Sep 17 00:00:00 2001 From: terrycz126 Date: Wed, 7 Nov 2018 23:54:34 +0800 Subject: [PATCH] Fix redefined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) warning --- src/lib_json/json_reader.cpp | 11 ++++++----- src/lib_json/json_writer.cpp | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index ad7e15d..65bfad3 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -19,19 +19,20 @@ #include #include -#if __cplusplus >= 201103L #include +#if __cplusplus >= 201103L #if !defined(sscanf) #define sscanf std::sscanf #endif -#else -#include + +#endif //__cplusplus #if defined(_MSC_VER) +#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 -#endif -#endif +#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES +#endif //_MSC_VER #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 // Disable warning about strdup being deprecated. diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 2197efb..36cf055 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -42,8 +42,11 @@ #define isfinite _finite #endif +#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 -#endif +#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES + +#endif //_MSC_VER #if defined(__sun) && defined(__SVR4) // Solaris #if !defined(isfinite)