From fdbccc888b01374b90f67a559e1718067ff819e8 Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Wed, 3 Mar 2021 01:24:07 +0000 Subject: Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier" This reverts commit ca86dbedfa505cc2762b51e6308b8f9ea8f63fe6. Reason for revert: all users should be fixed Change-Id: I11b7360ef4fbd0423a9be1b47a147ebbeea971aa --- include/json/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/json/config.h b/include/json/config.h index 6912567..6359273 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -74,7 +74,6 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size, // C++11 should be used directly in JSONCPP. #define JSONCPP_OVERRIDE override -#if 0 // Android change: b/170642246 #ifdef __clang__ #if __has_extension(attribute_deprecated_with_message) #define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message))) @@ -89,7 +88,6 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size, // MSVC) #define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) #endif // __clang__ || __GNUC__ || _MSC_VER -#endif // Android change: b/170642246 #if !defined(JSONCPP_DEPRECATED) #define JSONCPP_DEPRECATED(message) -- cgit v1.2.3