commit 04ce3dd40e28f337ccd96bdee3464a965654c83f
author Patrick Rohr <prohr@google.com> Thu Mar 11 10:34:50 2021 +0000
committer Patrick Rohr <prohr@google.com> Thu Mar 11 10:40:04 2021 +0000
tree d44e03c4a271758289dae2caddce0d78bbc10dda
parent fdbccc888b01374b90f67a559e1718067ff819e8

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

This reverts commit fdbccc888b01374b90f67a559e1718067ff819e8.

Reason for revert: This is breaking most ATV, see go/atv-build-cop-quarterdeck

Bug: 182450506
Change-Id: I11190274438b0470fefd432e19121aedb98072d9

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)