diff options
| author | Haibo Huang <hhb@google.com> | 2021-03-12 20:44:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-12 20:44:23 +0000 |
| commit | 6a7b9633e41c06ad2a47183e6ba9fddc68387138 (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 2c2a456ec847c0f74c8878c388bd9ddf94bfff6f (diff) | |
| parent | 578f4c5e09e3b6f50d67eb435d9affaca1a2e838 (diff) | |
| download | jsoncpp-6a7b9633e41c06ad2a47183e6ba9fddc68387138.tar.gz | |
Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""android-s-beta-2android-s-beta-1
| -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) |