diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-10-27 10:37:40 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-10-27 10:37:40 +0200 |
| commit | 9e27de87d9ab37006ff2b9a45128f08d83ab4ba6 (patch) | |
| tree | 75d464f2dc7fab4a653a18a6059402f6de41e370 /php/src | |
| parent | Whitespace cleanup (diff) | |
| download | ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.tar.bz2 ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.tar.xz ice-9e27de87d9ab37006ff2b9a45128f08d83ab4ba6.zip | |
Fixed iOS and PHP7 shadow warning related build failures
Diffstat (limited to 'php/src')
| -rw-r--r-- | php/src/php7/Types.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp index 5ce0c6b6d19..7add23fd1bd 100644 --- a/php/src/php7/Types.cpp +++ b/php/src/php7/Types.cpp @@ -485,6 +485,10 @@ IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap) zval* e; info->bytes.resize(zend_hash_num_elements(barr)); +#if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wshadow" +#endif vector<Ice::Byte>::size_type i = 0; ZEND_HASH_FOREACH_VAL(barr, e) { @@ -493,6 +497,9 @@ IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap) info->bytes[i++] = static_cast<Ice::Byte>(l); } ZEND_HASH_FOREACH_END(); +#if defined(__clang__) +# pragma clang diagnostic pop +#endif zval* instances = zend_hash_str_find(Z_OBJPROP_P(s), STRCAST("instances"), sizeof("instances") - 1); assert(Z_TYPE_P(instances) == IS_INDIRECT); @@ -501,6 +508,10 @@ IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap) HashTable* oarr = Z_ARRVAL_P(instances); zval* o; +#if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wshadow" +#endif ZEND_HASH_FOREACH_VAL(oarr, o) { assert(Z_TYPE_P(o) == IS_OBJECT); @@ -521,6 +532,9 @@ IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap) info->instances.push_back(writer); } ZEND_HASH_FOREACH_END(); +#if defined(__clang__) +# pragma clang diagnostic pop +#endif zval* hasOptionalMembers = zend_hash_str_find(Z_OBJPROP_P(s), STRCAST("hasOptionalMembers"), sizeof("hasOptionalMembers") - 1); |