From 9fb4e6737f3d1eefd6e1b3b48aa7c9a7cbaafaec Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Mon, 3 Dec 2018 14:12:14 -0500
Subject: Fixed bogus assert and misc warnings. Fixes #311.

---
 php/src/php5/Types.cpp | 10 +++++-----
 php/src/php5/Util.cpp  |  2 +-
 php/src/php7/Types.cpp |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'php/src')

diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp
index e74e9a76295..afa74087a9c 100644
--- a/php/src/php5/Types.cpp
+++ b/php/src/php5/Types.cpp
@@ -534,15 +534,15 @@ IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap TSRMLS_D
 
                     Ice::ObjectPtr writer;
 
-                    ObjectMap::iterator i = objectMap->find(Z_OBJ_HANDLE_P(o));
-                    if(i == objectMap->end())
+                    ObjectMap::iterator j = objectMap->find(Z_OBJ_HANDLE_P(o));
+                    if(j == objectMap->end())
                     {
                         writer = new ObjectWriter(o, objectMap, 0 TSRMLS_CC);
                         objectMap->insert(ObjectMap::value_type(Z_OBJ_HANDLE_P(o), writer));
                     }
                     else
                     {
-                        writer = i->second;
+                        writer = j->second;
                     }
 
                     info->instances.push_back(writer);
@@ -1244,7 +1244,7 @@ convertDataMembers(zval* zv, DataMemberList& reqMembers, DataMemberList& optMemb
 
         assert(Z_TYPE_PP(arr) == IS_ARRAY);
         HashTable* member = Z_ARRVAL_PP(arr);
-        assert(zend_hash_num_elements(member) == allowOptional ? 4 : 2);
+        assert(zend_hash_num_elements(member) == (allowOptional ? 4 : 2));
         zend_hash_index_find(member, 0, reinterpret_cast<void**>(&elem));
         assert(Z_TYPE_PP(elem) == IS_STRING);
         m->name = Z_STRVAL_PP(elem);
@@ -3393,7 +3393,7 @@ IcePHP::ExceptionInfo::unmarshal(Ice::InputStream* is, const CommunicatorInfoPtr
             {
                 zval* un;
                 MAKE_STD_ZVAL(un);
-                AutoDestroy destroy(un);
+                AutoDestroy destroy2(un);
                 assignUnset(un TSRMLS_CC);
                 member->setMember(zv, un TSRMLS_CC);
             }
diff --git a/php/src/php5/Util.cpp b/php/src/php5/Util.cpp
index 8cdbbe1e1e0..423c29ff09a 100644
--- a/php/src/php5/Util.cpp
+++ b/php/src/php5/Util.cpp
@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <ctype.h>
 
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined(__clang__)
 // False warning with older GCC
 #   pragma GCC diagnostic ignored "-Wclobbered"
 #endif
diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp
index 47daa1d03b3..ac03e20e922 100644
--- a/php/src/php7/Types.cpp
+++ b/php/src/php7/Types.cpp
@@ -1189,7 +1189,7 @@ convertDataMembers(zval* zv, DataMemberList& reqMembers, DataMemberList& optMemb
 
         assert(Z_TYPE_P(arr) == IS_ARRAY);
         HashTable* member = Z_ARRVAL_P(arr);
-        assert(allowOptional ? zend_hash_num_elements(member) == 4 : zend_hash_num_elements(member) == 2);
+        assert(zend_hash_num_elements(member) == (allowOptional ? 4 : 2));
 
         elem = zend_hash_index_find(member, 0);
         assert(Z_TYPE_P(elem) == IS_STRING);
-- 
cgit v1.2.3