commit 16bffac93e8a9e030713a0d5d721de12aebdcbad
author Haibo Huang <hhb@google.com> Fri Mar 12 23:22:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 23:22:41 2021 +0000
tree a39bc599e78f83beddd0e70400ba7806c2d1739a
parent c69107807d94ae487f71f55128d6339db24646c9
parent e9d9efff662b5c6342d767439ec4f04e910ce6c5

Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 6a7b9633e4 am: b7b7b463ad am: 914b877f8b am: e9d9efff66

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76ac2578e5d8ae4917b58acf184bc1ca4bc73bed

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)