diff options
| author | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-05-29 18:03:34 +0200 |
|---|---|---|
| committer | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-05-29 18:18:09 +0200 |
| commit | 4fe34b2d29ca67ea91b2545b223dad8abbcad282 (patch) | |
| tree | 34d99fca6f3ad23737d073c086bc3e702d8176a3 /Utilities/cmjsoncpp | |
| parent | 067a4f484b1e2f650918d90051653b5c434c77a2 (diff) | |
| download | cmake-4fe34b2d29ca67ea91b2545b223dad8abbcad282.tar.gz | |
Fixing warnings generated by clang 8.0 on Windows
* Deprecation removals previously specific to MSVC/Intel now also used
by clang
* String literals were assigned to non const pointers. These are stored
in mutable arrays now
* An implicit function pointer to pointer conversion is a Microsoft
extension warning is suppressed by an explicit reinterpret_cast
* The MSVC specific deprecation macro for jsoncpp was moved after the
clang macro to avoid redefinition warnings. This is consistent with
how jsoncpp fixed the issue in 36d8cfd7
Diffstat (limited to 'Utilities/cmjsoncpp')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/config.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Utilities/cmjsoncpp/include/json/config.h b/Utilities/cmjsoncpp/include/json/config.h index 34f731490a..2cc8462b37 100644 --- a/Utilities/cmjsoncpp/include/json/config.h +++ b/Utilities/cmjsoncpp/include/json/config.h @@ -79,11 +79,6 @@ # pragma warning(disable : 4786) # endif // MSVC 6 -# if _MSC_VER >= 1500 // MSVC 2008 - /// Indicates that the following function is deprecated. -# define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) -# endif - #endif // defined(_MSC_VER) // In c++11 the override keyword allows you to explicity define that a function @@ -137,7 +132,10 @@ # elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) # define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__)) # endif // GNUC version -#endif // __clang__ || __GNUC__ +#elif defined(_MSC_VER) && _MSC_VER >= 1500 // MSVC 2008 + /// Indicates that the following function is deprecated. +# define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) +#endif // __clang__ || __GNUC__ || _MSC_VER #undef JSONCPP_DEPRECATED // no deprecations in CMake copy #if !defined(JSONCPP_DEPRECATED) |