cJSON

mirror of Dave's cJSON
git clone git://git.thc420.xyz/cJSON
Log | Files | Refs | README | LICENSE

commit 227d3398d6b967879761ebe02c1b63dbd6ea6e0d
parent 466eb8e3f8a65080f2b3ca4a79ab7b72bd539dba
Author: Max Bruckner <max@maxbruckner.de>
Date:   Sat, 18 Mar 2017 17:52:33 +0100

Fix the pragmas for Wcast-qual with old gcc versions

Diffstat:
McJSON.c | 10+++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cJSON.c b/cJSON.c @@ -1580,6 +1580,10 @@ CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSO item->type &= ~cJSON_StringIsConst; } +#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic push +#endif +#pragma GCC diagnostic ignored "-Wcast-qual" /* Add an item to an object with constant string as key */ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item) { @@ -1591,13 +1595,13 @@ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJ { global_hooks.deallocate(item->string); } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-qual" item->string = (char*)string; -#pragma GCC diagnostic pop item->type |= cJSON_StringIsConst; cJSON_AddItemToArray(object, item); } +#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) + #pragma GCC diagnostic pop +#endif CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item) {