summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/BasicStream.cpp16
-rw-r--r--cpp/src/slice2cpp/Gen.cpp2
-rw-r--r--cpp/src/slice2cppe/Gen.cpp2
3 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 69da348ba6e..340c1d97ad0 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -707,7 +707,7 @@ IceInternal::BasicStream::readBlob(Ice::Byte* v, Container::size_type sz)
void
IceInternal::BasicStream::write(const Byte* begin, const Byte* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -751,7 +751,7 @@ IceInternal::BasicStream::write(const vector<bool>& v)
void
IceInternal::BasicStream::write(const bool* begin, const bool* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -806,7 +806,7 @@ IceInternal::BasicStream::write(Short v)
void
IceInternal::BasicStream::write(const Short* begin, const Short* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -901,7 +901,7 @@ IceInternal::BasicStream::write(Int v)
void
IceInternal::BasicStream::write(const Int* begin, const Int* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -1012,7 +1012,7 @@ IceInternal::BasicStream::write(Long v)
void
IceInternal::BasicStream::write(const Long* begin, const Long* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -1131,7 +1131,7 @@ IceInternal::BasicStream::write(Float v)
void
IceInternal::BasicStream::write(const Float* begin, const Float* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -1242,7 +1242,7 @@ IceInternal::BasicStream::write(Double v)
void
IceInternal::BasicStream::write(const Double* begin, const Double* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
@@ -1367,7 +1367,7 @@ IceInternal::BasicStream::write(const string& v)
void
IceInternal::BasicStream::write(const string* begin, const string* end)
{
- Int sz = end - begin;
+ Int sz = static_cast<Int>(end - begin);
writeSize(sz);
if(sz > 0)
{
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 81f34a76f51..f8fa60402ed 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -941,7 +941,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const "
<< s << "* begin, const " << s << "* end, " << scope << "__U__" << name << ")";
C << sb;
- C << nl << "::Ice::Int size = end - begin;";
+ C << nl << "::Ice::Int size = static_cast< ::Ice::Int>(end - begin);";
C << nl << "__os->writeSize(size);";
C << nl << "for(int i = 0; i < size; ++i)";
C << sb;
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 5ef7510641f..ddc010cd38c 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -791,7 +791,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p)
C << sp << nl << "void" << nl << scope.substr(2) << "__write(::IceInternal::BasicStream* __os, const "
<< s << "* begin, const " << s << "* end, " << scope << "__U__" << name << ")";
C << sb;
- C << nl << "::Ice::Int size = end - begin;";
+ C << nl << "::Ice::Int size = static_cast< ::Ice::Int>(end - begin);";
C << nl << "__os->writeSize(size);";
C << nl << "for(int i = 0; i < size; ++i)";
C << sb;