diff options
| author | Haibo Huang <hhb@google.com> | 2021-03-11 06:27:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-11 06:27:41 +0000 |
| commit | 9b1642bccd391eb9a0b1ca6997c2ce3fd695a148 (patch) | |
| tree | a39bc599e78f83beddd0e70400ba7806c2d1739a | |
| parent | c3cf98ec13a2c179a2d0d35c98976fc7490aa7ee (diff) | |
| parent | fdbccc888b01374b90f67a559e1718067ff819e8 (diff) | |
| download | jsoncpp-9b1642bccd391eb9a0b1ca6997c2ce3fd695a148.tar.gz | |
Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""
| -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) |