Merge pull request #478 from quantumsteve/msvc_override

Use override keyword with Visual Studio.
open-source-parsers · May 28, 2016 · 43203f1 · 43203f1
2 parents 4356d9b + 55176b2
commit 43203f1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/include/json/config.h b/include/json/config.h
@@ -80,7 +80,9 @@
 // In c++11 the override keyword allows you to explicity define that a function
 // is intended to override the base-class version.  This makes the code more
 // managable and fixes a set of common hard-to-find bugs.
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L 
+# define JSONCPP_OVERRIDE override
+#elif defined(_MSC_VER) && _MSC_VER > 1600
 # define JSONCPP_OVERRIDE override
 #else
 # define JSONCPP_OVERRIDE