mirror of
https://github.com/json-c/json-c.git
synced 2026-09-07 08:36:50 +08:00
Issue #941: fix "defined but not used" errors when building with a c++ compiler.
This commit is contained in:
+2
-2
@@ -488,7 +488,7 @@ JSON_EXPORT void json_object_object_del(struct json_object *obj, const char *key
|
|||||||
* @param val the local name for the json_object* object variable defined in
|
* @param val the local name for the json_object* object variable defined in
|
||||||
* the body
|
* the body
|
||||||
*/
|
*/
|
||||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
|
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && (defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L))
|
||||||
|
|
||||||
#define json_object_object_foreach(obj, key, val) \
|
#define json_object_object_foreach(obj, key, val) \
|
||||||
char *key = NULL; \
|
char *key = NULL; \
|
||||||
@@ -520,7 +520,7 @@ JSON_EXPORT void json_object_object_del(struct json_object *obj, const char *key
|
|||||||
: 0); \
|
: 0); \
|
||||||
entry##key = entry_next##key)
|
entry##key = entry_next##key)
|
||||||
|
|
||||||
#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) && (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) */
|
#endif
|
||||||
|
|
||||||
/** Iterate through all keys and values of an object (ANSI C Safe)
|
/** Iterate through all keys and values of an object (ANSI C Safe)
|
||||||
* @param obj the json_object instance
|
* @param obj the json_object instance
|
||||||
|
|||||||
+1
-1
@@ -345,7 +345,7 @@ int lh_table_resize(struct lh_table *t, int new_size);
|
|||||||
/**
|
/**
|
||||||
* @deprecated Don't use this outside of linkhash.h:
|
* @deprecated Don't use this outside of linkhash.h:
|
||||||
*/
|
*/
|
||||||
#if !defined (__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
|
#if !defined(__cplusplus) && (!defined (__STDC_VERSION__) || (__STDC_VERSION__ < 199901L))
|
||||||
/* C89 compilers like VS2010 can't handle inline funcs, so skip it there,
|
/* C89 compilers like VS2010 can't handle inline funcs, so skip it there,
|
||||||
note: this also applies to -std=c89 in GCC! */
|
note: this also applies to -std=c89 in GCC! */
|
||||||
#define _LH_INLINE
|
#define _LH_INLINE
|
||||||
|
|||||||
Reference in New Issue
Block a user