From 80497f102e307a153823bc9d29510c5916a2b632 Mon Sep 17 00:00:00 2001
From: Connor Manning <connor@hobu.co>
Date: Tue, 10 Mar 2015 18:48:45 -0500
Subject: [PATCH 1/4] Use C++ standard headers.

---
 src/lib_json/json_writer.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index c7f72ee22..dc76032ed 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -12,15 +12,20 @@
 #include <sstream>
 #include <utility>
 #include <set>
-#include <assert.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
 
 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
 #include <float.h>
 #define isfinite _finite
 #define snprintf _snprintf
+#elif defined(__sun) && defined(__SVR4) //Solaris
+#include <ieeefp.h>
+#define isfinite finite
+#else
+#include <cmath>
+#define isfinite std::isfinite
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
@@ -28,11 +33,6 @@
 #pragma warning(disable : 4996)
 #endif
 
-#if defined(__sun) && defined(__SVR4) //Solaris
-#include <ieeefp.h>
-#define isfinite finite
-#endif
-
 namespace Json {
 
 #if __cplusplus >= 201103L

From 5ebe023f4c2976a24c2bd982fb4891fc8d1d76d6 Mon Sep 17 00:00:00 2001
From: Connor Manning <connor@hobu.co>
Date: Tue, 10 Mar 2015 18:50:16 -0500
Subject: [PATCH 2/4] Fix isfinite for MSVC.

---
 src/lib_json/json_writer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index dc76032ed..de13f1bd8 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -16,7 +16,7 @@
 #include <cstring>
 #include <cstdio>
 
-#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
+#if defined(_MSC_VER) && _MSC_VER >= 1200 // VC++ 6.0 and above
 #include <float.h>
 #define isfinite _finite
 #define snprintf _snprintf
@@ -28,6 +28,11 @@
 #define isfinite std::isfinite
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
+#include <float.h>
+#define snprintf _snprintf
+#endif
+
 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
 // Disable warning about strdup being deprecated.
 #pragma warning(disable : 4996)

From 5740bcbc82144febca79cffb0e22b233c5127463 Mon Sep 17 00:00:00 2001
From: Connor Manning <connor@hobu.co>
Date: Wed, 11 Mar 2015 09:01:49 -0500
Subject: [PATCH 3/4] Constrain MSVC _isfinite to before 2013, remove duplicate
 includes.

---
 src/lib_json/json_writer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index de13f1bd8..f7ad1e21b 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -16,10 +16,9 @@
 #include <cstring>
 #include <cstdio>
 
-#if defined(_MSC_VER) && _MSC_VER >= 1200 // VC++ 6.0 and above
+#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1800 // Between VC++ 6.0 and VC++ 11.0
 #include <float.h>
 #define isfinite _finite
-#define snprintf _snprintf
 #elif defined(__sun) && defined(__SVR4) //Solaris
 #include <ieeefp.h>
 #define isfinite finite
@@ -29,7 +28,6 @@
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
-#include <float.h>
 #define snprintf _snprintf
 #endif
 

From d1308a3f08f22b58b91cc9aa906bcc737fe14593 Mon Sep 17 00:00:00 2001
From: Connor Manning <connor@hobu.co>
Date: Wed, 11 Mar 2015 13:13:42 -0500
Subject: [PATCH 4/4] Use std namespace for snprintf.

---
 src/lib_json/json_writer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index f7ad1e21b..83102fd2b 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -29,6 +29,8 @@
 
 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
 #define snprintf _snprintf
+#else
+#define snprintf std::snprintf
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0