diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-13 04:02:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-13 04:02:50 +0000 |
| commit | 3ae1c89288599b4cab1abccfe06f16e1fc62fb6f (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 1b0e429802e0c05e6910c23e766e39de748f4f60 (diff) | |
| parent | 31d236f84b6cdc929e5e6e35cd207c9588624f82 (diff) | |
| download | jsoncpp-3ae1c89288599b4cab1abccfe06f16e1fc62fb6f.tar.gz | |
Snap for 7205519 from 31d236f84b6cdc929e5e6e35cd207c9588624f82 to tm-release
Change-Id: I9807887f6a85aa2c9fdc4602c426c1d054ccb062
| -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) |