commit 8b5f99552e6a5dc629324714bdffc68b39d4132a
author android-build-team Robot <android-build-team-robot@google.com> Sun Mar 14 00:03:16 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Mar 14 00:03:16 2021 +0000
tree a39bc599e78f83beddd0e70400ba7806c2d1739a
parent 3a811a4ce556dc47481d9039b5208b8142436f9c
parent e9d9efff662b5c6342d767439ec4f04e910ce6c5

Snap for 7206732 from e9d9efff662b5c6342d767439ec4f04e910ce6c5 to sc-release

Change-Id: I0539f4a4b302dd17dc89cf74aef1549d366529c7

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)