summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/IncomingAsync.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-08-08 15:49:02 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-08-08 15:49:02 +0200
commit5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec (patch)
tree71f7dd2a1096dab81bd8ddb4e17d5ac42f38c65d /cpp/src/Ice/IncomingAsync.cpp
parentFixes (diff)
parentFixed python & ruby compilation error caused by OutputStream::format removal (diff)
downloadice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.bz2
ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.xz
ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.zip
Merge remote-tracking branch 'origin/encoding11' into mx
Diffstat (limited to 'cpp/src/Ice/IncomingAsync.cpp')
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 4f2564be30e..e9f8c628e00 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -308,7 +308,7 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>&
}
else
{
- __writeParamEncaps(&outEncaps[0], outEncaps.size(), ok);
+ __writeParamEncaps(&outEncaps[0], static_cast< ::Ice::Int>(outEncaps.size()), ok);
}
}
catch(const LocalException& ex)