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