From 7340f1e9c86676ca2eef980638cadd3ad01ec615 Mon Sep 17 00:00:00 2001 From: owent Date: Tue, 17 Jul 2018 21:25:20 +0800 Subject: [PATCH] Fix MSGPACK_DEPRECATED for MSVC 1914 with /Zc:__cplusplus, @see https://docs.microsoft.com/cpp/build/reference/zc-cplusplus --- include/msgpack/v1/cpp_config.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/msgpack/v1/cpp_config.hpp b/include/msgpack/v1/cpp_config.hpp index a7f529d2..0eb518d8 100644 --- a/include/msgpack/v1/cpp_config.hpp +++ b/include/msgpack/v1/cpp_config.hpp @@ -127,7 +127,11 @@ template struct is_pointer : detail::is_pointer_helper= 201402L +#if defined(_MSC_VER) +#define MSGPACK_DEPRECATED(msg) __declspec(deprecated(msg)) +#else // _MSC_VER 1914+ with /Zc:__cplusplus, @see https://docs.microsoft.com/cpp/build/reference/zc-cplusplus #define MSGPACK_DEPRECATED(msg) [[deprecated(msg)]] +#endif #else // __cplusplus >= 201402L #define MSGPACK_DEPRECATED(msg) #endif // __cplusplus >= 201402L