commit 549ae99221537c12af3f86b0f6f05f6f35cadbd7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 11 12:56:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 12:56:29 2021 +0000
tree d44e03c4a271758289dae2caddce0d78bbc10dda
parent 9725ff3bd286ed73ef2e9b95fdc5e905a07c8262
parent 2c2a456ec847c0f74c8878c388bd9ddf94bfff6f

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8746466bed0afb68deb63038c07f1e29890ac035

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)