isfinite global declaration conflicted with boost

Author: dawesc

include/json/writer.h

@@ -341,6 +341,8 @@ typename _Value::String JSON_API valueToQuotedString(const char* value);
 
 } // namespace detail
 
+bool jsonIsFinite(double value);
+
 typedef detail::FastWriter<detail::Value<>> FastWriter; 					// class Json::FastWriter
 typedef detail::StreamWriter<detail::Value<>> StreamWriter; 				// class Json::StreamWriter
 typedef detail::StreamWriterBuilder<detail::Value<>> StreamWriterBuilder; 	// class Json::StreamWriterBuilder

include/json/writer.inl

@@ -19,36 +19,6 @@
 #include <cstring>
 #include <cstdio>
 
-#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1800 // Between VC++ 6.0 and VC++ 11.0
-#include <float.h>
-#define isfinite _finite
-#elif defined(__sun) && defined(__SVR4) //Solaris
-#if !defined(isfinite)
-#include <ieeefp.h>
-#define isfinite finite
-#endif
-#elif defined(_AIX)
-#if !defined(isfinite)
-#include <math.h>
-#define isfinite finite
-#endif
-#elif defined(__hpux)
-#if !defined(isfinite)
-#if defined(__ia64) && !defined(finite)
-#define isfinite(x) ((sizeof(x) == sizeof(float) ? \
-                     _Isfinitef(x) : _IsFinite(x)))
-#else
-#include <math.h>
-#define isfinite finite
-#endif
-#endif
-#else
-#include <cmath>
-#if !(defined(__QNXNTO__)) // QNX already defines isfinite
-#define isfinite std::isfinite
-#endif
-#endif
-
 #if defined(_MSC_VER)
 #if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
 #define snprintf sprintf_s
@@ -67,7 +37,6 @@
 
 #if defined(__BORLANDC__)  
 #include <float.h>
-#define isfinite _finite
 #define snprintf _snprintf
 #endif
 
@@ -137,7 +106,7 @@ typename _Value::String valueToString(double value, bool useSpecialFloats, unsig
   // Print into the buffer. We need not request the alternative representation
   // that always has a decimal point because JSON doesn't distingish the
   // concepts of reals and integers.
-  if (isfinite(value)) {
+  if (jsonIsFinite(value)) {
     len = snprintf(buffer, sizeof(buffer), formatString, value);
   } else {
     // IEEE standard states that NaN values will not compare to themselves

src/lib_json/json_writer.cpp

@@ -46,26 +46,9 @@
 #endif
 #endif
 
-#if defined(_MSC_VER)
-#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
-#define snprintf sprintf_s
-#elif _MSC_VER >= 1900 // VC++ 14.0 and above
-#define snprintf std::snprintf
-#else
-#define snprintf _snprintf
-#endif
-#elif defined(__ANDROID__) || defined(__QNXNTO__)
-#define snprintf snprintf
-#elif __cplusplus >= 201103L
-#if !defined(__MINGW32__)
-#define snprintf std::snprintf
-#endif
-#endif
-
-#if defined(__BORLANDC__)  
+#if defined(__BORLANDC__)
 #include <float.h>
 #define isfinite _finite
-#define snprintf _snprintf
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
@@ -81,6 +64,10 @@ typedef std::unique_ptr<StreamWriter> StreamWriterPtr;
 typedef std::auto_ptr<StreamWriter>   StreamWriterPtr;
 #endif
 
+bool jsonIsFinite(double value) {
+  return isfinite(value);
+}
+
 namespace detail {
 
 bool containsControlCharacter(const char* str) {