diff options
| author | Haibo Huang <hhb@google.com> | 2021-03-11 07:50:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 07:50:36 +0000 |
| commit | 5c47f00ea3d2e3a01835ec2f2bfabd3217e0ee42 (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 5da34eb81722ed5688f6723bc2dd5adc0f54f2ee (diff) | |
| parent | 9725ff3bd286ed73ef2e9b95fdc5e905a07c8262 (diff) | |
| download | jsoncpp-5c47f00ea3d2e3a01835ec2f2bfabd3217e0ee42.tar.gz | |
Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" am: 9b1642bccd am: 9725ff3bd2
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9aad0ab5df185f8f1dcf7257f6a67fd734d558cc
| -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) |