commit fdbccc888b01374b90f67a559e1718067ff819e8
author Haibo Huang <hhb@google.com> Wed Mar 03 01:24:07 2021 +0000
committer Haibo Huang <hhb@google.com> Wed Mar 03 01:24:27 2021 +0000
tree a39bc599e78f83beddd0e70400ba7806c2d1739a
parent c3cf98ec13a2c179a2d0d35c98976fc7490aa7ee

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

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)