diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-11 14:36:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 14:36:32 +0000 |
| commit | 70f782207e3a386c6b4f0dd4b4bdd115d909062d (patch) | |
| tree | d44e03c4a271758289dae2caddce0d78bbc10dda | |
| parent | 948704fa74f3b5b571503fc910d0cb5a00a29db1 (diff) | |
| parent | 7dbaba12dda072a06f2d82f1c6854b426eeb018d (diff) | |
| download | jsoncpp-70f782207e3a386c6b4f0dd4b4bdd115d909062d.tar.gz | |
Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671 am: 7dbaba12dd
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f624bc560f73915013f03cbd3972970b8c1fbea
| -rw-r--r-- | include/json/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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))) @@ -88,6 +89,7 @@ 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) |