commit 7dbaba12dda072a06f2d82f1c6854b426eeb018d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 11 14:08:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 14:08:42 2021 +0000
tree d44e03c4a271758289dae2caddce0d78bbc10dda
parent 0e8230737c3c3c70d9d558648d9fb8d5df4301b8
parent 87f427b6710b57e27238d79ac0945927ae5a1808

Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d1858ea2403a104dad450f4c4c93b67faaf8a46

include/json/config.h

diff --git a/include/json/config.h b/include/json/config.h
index 6359273..6912567 100644
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -74,6 +74,7 @@
 // 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)))
@@ -88,6 +89,7 @@
                         // 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)