Skip to content

Commit 43203f1

Browse files
committed
Merge pull request #478 from quantumsteve/msvc_override
Use override keyword with Visual Studio.
2 parents 4356d9b + 55176b2 commit 43203f1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

include/json/config.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@
8080
// In c++11 the override keyword allows you to explicity define that a function
8181
// is intended to override the base-class version. This makes the code more
8282
// managable and fixes a set of common hard-to-find bugs.
83-
#if __cplusplus >= 201103L
83+
#if __cplusplus >= 201103L
84+
# define JSONCPP_OVERRIDE override
85+
#elif defined(_MSC_VER) && _MSC_VER > 1600
8486
# define JSONCPP_OVERRIDE override
8587
#else
8688
# define JSONCPP_OVERRIDE

0 commit comments

Comments
 (0)