diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-14 00:03:05 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-14 00:03:05 +0000 |
| commit | bb5e8c933cb7679e187e47d13d7490418129ea1c (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | 26d9f6bd5406705befd43bf8db6c13f24ef6c30f (diff) | |
| parent | e9d9efff662b5c6342d767439ec4f04e910ce6c5 (diff) | |
| download | jsoncpp-android12-d1-s4-release.tar.gz | |
Snap for 7206732 from e9d9efff662b5c6342d767439ec4f04e910ce6c5 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I655040502c9eb21fcb4cf10b62ca902f16648f4f
| -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) |