commit 578f4c5e09e3b6f50d67eb435d9affaca1a2e838
author Haibo Huang <hhb@google.com> Fri Mar 12 18:36:18 2021 +0000
committer Haibo Huang <hhb@google.com> Fri Mar 12 18:37:13 2021 +0000
tree a39bc599e78f83beddd0e70400ba7806c2d1739a
parent 2c2a456ec847c0f74c8878c388bd9ddf94bfff6f

Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"

This reverts commit 04ce3dd40e28f337ccd96bdee3464a965654c83f.

Reason for revert: try this again

Change-Id: Ia27ce73ddd4a0a086da89e4c63cc9a619df39188

include/json/config.h

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 @@
 // 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 @@
                         // 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)