From 55176b2bdd5be57f41c5df3ec595b9e95689fc92 Mon Sep 17 00:00:00 2001 From: Steven Hahn Date: Wed, 25 May 2016 18:28:22 -0400 Subject: [PATCH] Use override keyword with Visual Studio. --- include/json/config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/json/config.h b/include/json/config.h index f86abc7..606cc85 100644 --- 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