Enable -Wconversion with clang - Close #363

3 files changed, 28 insertions, 26 deletions

diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index ed0ef82e10e..f4bcd8256cc 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -3199,7 +3199,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */)
         //
         // Create the output buffer and copy in the outParams.
         //
-        PyObjectHandle op = PyBuffer_New(out.size());
+        PyObjectHandle op = PyBuffer_New(static_cast<Py_ssize_t>(out.size()));
         if(!op.get())
         {
             throwPythonException();
@@ -3212,7 +3212,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */)
             {
                 throwPythonException();
             }
-            memcpy(buf, &out[0], ssz);
+            memcpy(buf, &out[0], static_cast<size_t>(ssz));
         }
 #endif
 
@@ -3481,7 +3481,7 @@ IcePy::AsyncBlobjectInvocation::end(const Ice::ObjectPrx& proxy, const Ice::Asyn
             return 0;
         }
         assert(sz == results.second - results.first);
-        memcpy(buf, results.first, sz);
+        memcpy(buf, results.first, static_cast<size_t>(sz));
 #endif
 
         PyTuple_SET_ITEM(args.get(), 1, op.release()); // PyTuple_SET_ITEM steals a reference.
@@ -3563,7 +3563,7 @@ IcePy::AsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*, c
             return;
         }
         assert(sz == results.second - results.first);
-        memcpy(buf, results.first, sz);
+        memcpy(buf, results.first, static_cast<size_t>(sz));
 #endif
 
         PyTuple_SET_ITEM(args.get(), 1, op.release()); // PyTuple_SET_ITEM steals a reference.
@@ -3750,7 +3750,7 @@ IcePy::NewAsyncBlobjectInvocation::handleResponse(PyObject* future, bool ok,
         return;
     }
     assert(sz == results.second - results.first);
-    memcpy(buf, results.first, sz);
+    memcpy(buf, results.first, static_cast<size_t>(sz));
 #endif
 
     PyTuple_SET_ITEM(args.get(), 1, op.release()); // PyTuple_SET_ITEM steals a reference.
@@ -4082,7 +4082,7 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*,
         throwPythonException();
     }
     assert(sz == inBytes.second - inBytes.first);
-    memcpy(buf, inBytes.first, sz);
+    memcpy(buf, inBytes.first, static_cast<size_t>(sz));
 #endif
 
     PyTuple_SET_ITEM(args.get(), start, ip.release()); // PyTuple_SET_ITEM steals a reference.
diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp
index 2e33db2c632..7ecc7379af7 100644
--- a/python/modules/IcePy/Types.cpp
+++ b/python/modules/IcePy/Types.cpp
@@ -464,7 +464,7 @@ IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr&
         throw AbortMarshaling();
     }
 
-    PyObjectHandle slices = PyTuple_New(slicedData->slices.size());
+    PyObjectHandle slices = PyTuple_New(static_cast<Py_ssize_t>(slicedData->slices.size()));
     if(!slices.get())
     {
         assert(PyErr_Occurred());
@@ -520,9 +520,11 @@ IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr&
         if((*p)->bytes.size() > 0)
         {
     #if PY_VERSION_HEX >= 0x03000000
-            bytes = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(&(*p)->bytes[0]), (*p)->bytes.size());
+            bytes = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(&(*p)->bytes[0]),
+                                              static_cast<Py_ssize_t>((*p)->bytes.size()));
     #else
-            bytes = PyString_FromStringAndSize(reinterpret_cast<const char*>(&(*p)->bytes[0]), (*p)->bytes.size());
+            bytes = PyString_FromStringAndSize(reinterpret_cast<const char*>(&(*p)->bytes[0]),
+                                               static_cast<Py_ssize_t>((*p)->bytes.size()));
     #endif
         }
         else
@@ -542,7 +544,7 @@ IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr&
         //
         // instances
         //
-        PyObjectHandle instances = PyTuple_New((*p)->instances.size());
+        PyObjectHandle instances = PyTuple_New(static_cast<Py_ssize_t>((*p)->instances.size()));
         if(!instances.get() || PyObject_SetAttrString(slice.get(), STRCAST("instances"), instances.get()) < 0)
         {
             assert(PyErr_Occurred());
@@ -2040,7 +2042,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindBool:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::BoolSeq seq(sz);
+        Ice::BoolSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2056,7 +2058,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                              static_cast<int>(i));
                 throw AbortMarshaling();
             }
-            seq[i] = isTrue ? true : false;
+            seq[static_cast<size_t>(i)] = isTrue ? true : false;
         }
         os->write(seq);
         break;
@@ -2080,7 +2082,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
         else
         {
             sz = PySequence_Fast_GET_SIZE(fs.get());
-            Ice::ByteSeq seq(sz);
+            Ice::ByteSeq seq(static_cast<size_t>(sz));
             for(Py_ssize_t i = 0; i < sz; ++i)
             {
                 PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2098,7 +2100,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                                  static_cast<int>(i));
                     throw AbortMarshaling();
                 }
-                seq[i] = static_cast<Ice::Byte>(val);
+                seq[static_cast<size_t>(i)] = static_cast<Ice::Byte>(val);
             }
             os->write(seq);
         }
@@ -2107,7 +2109,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindShort:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::ShortSeq seq(sz);
+        Ice::ShortSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2125,7 +2127,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                              static_cast<int>(i));
                 throw AbortMarshaling();
             }
-            seq[i] = static_cast<Ice::Short>(val);
+            seq[static_cast<size_t>(i)] = static_cast<Ice::Short>(val);
         }
         os->write(seq);
         break;
@@ -2133,7 +2135,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindInt:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::IntSeq seq(sz);
+        Ice::IntSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2151,7 +2153,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                              static_cast<int>(i));
                 throw AbortMarshaling();
             }
-            seq[i] = static_cast<Ice::Int>(val);
+            seq[static_cast<size_t>(i)] = static_cast<Ice::Int>(val);
         }
         os->write(seq);
         break;
@@ -2159,7 +2161,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindLong:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::LongSeq seq(sz);
+        Ice::LongSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2177,7 +2179,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                              static_cast<int>(i));
                 throw AbortMarshaling();
             }
-            seq[i] = val;
+            seq[static_cast<size_t>(i)] = val;
         }
         os->write(seq);
         break;
@@ -2185,7 +2187,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindFloat:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::FloatSeq seq(sz);
+        Ice::FloatSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2203,7 +2205,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                 throw AbortMarshaling();
             }
 
-            seq[i] = val;
+            seq[static_cast<size_t>(i)] = val;
         }
         os->write(seq);
         break;
@@ -2211,7 +2213,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
     case PrimitiveInfo::KindDouble:
     {
         sz = PySequence_Fast_GET_SIZE(fs.get());
-        Ice::DoubleSeq seq(sz);
+        Ice::DoubleSeq seq(static_cast<size_t>(sz));
         for(Py_ssize_t i = 0; i < sz; ++i)
         {
             PyObject* item = PySequence_Fast_GET_ITEM(fs.get(), i);
@@ -2229,7 +2231,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje
                 throw AbortMarshaling();
             }
 
-            seq[i] = val;
+            seq[static_cast<size_t>(i)] = val;
         }
         os->write(seq);
         break;
@@ -2622,7 +2624,7 @@ IcePy::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ice:
 
         for(int i = 0; i < sz; ++i)
         {
-            PyObjectHandle item = createString(seq[i]);
+            PyObjectHandle item = createString(seq[static_cast<size_t>(i)]);
             if(!item.get())
             {
                 assert(PyErr_Occurred());
diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
index 30c2a877223..6a17e0e4c1d 100644
--- a/python/modules/IcePy/Util.cpp
+++ b/python/modules/IcePy/Util.cpp
@@ -177,7 +177,7 @@ IcePy::getString(PyObject* p)
             str.assign(s, sz);
         }
 #else
-        str.assign(PyString_AS_STRING(p), PyString_GET_SIZE(p));
+        str.assign(PyString_AS_STRING(p), static_cast<size_t>(PyString_GET_SIZE(p)));
 #endif
     }
     return str;