diff options
| author | Haibo Huang <hhb@google.com> | 2021-03-12 21:27:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 21:27:25 +0000 |
| commit | b7b7b463ade9a824290d7dfd271b142ce9d7cb04 (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 549ae99221537c12af3f86b0f6f05f6f35cadbd7 (diff) | |
| parent | 6a7b9633e41c06ad2a47183e6ba9fddc68387138 (diff) | |
| download | jsoncpp-b7b7b463ade9a824290d7dfd271b142ce9d7cb04.tar.gz | |
Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 6a7b9633e4android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6de05d36db8cfc7cbf8aaa2264ad210d2536f778
| -rw-r--r-- | include/json/config.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size, // 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 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size, // 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) |