summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/BasicStream.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-09-19 12:00:52 -0400
committerBernard Normier <bernard@zeroc.com>2012-09-19 12:09:56 -0400
commit2068ac0ec6ce1f239abc73ff23407326ba33ffbf (patch)
tree110b52821232cdc5ffb1d6cd4f5f2110ed520f4d /cpp/include/Ice/BasicStream.h
parentPython support for optionals (diff)
downloadice-2068ac0ec6ce1f239abc73ff23407326ba33ffbf.tar.bz2
ice-2068ac0ec6ce1f239abc73ff23407326ba33ffbf.tar.xz
ice-2068ac0ec6ce1f239abc73ff23407326ba33ffbf.zip
Partial fix for ICE-3393:
- strealined StreamTraits.h - added ability to define custom dictionaries in C++ (with cpp:type:...) - added tests for custom dictionaries in test/Ice/custom Fixed ICE-4867: - clear parameter before unmarshaling into dictionary/map in C++ - added test
Diffstat (limited to 'cpp/include/Ice/BasicStream.h')
-rw-r--r--cpp/include/Ice/BasicStream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index fcffd268000..77b2d4dec56 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -459,14 +459,14 @@ public:
void startSize()
{
- _sizePos = static_cast<int>(b.size());
+ _sizePos = static_cast<Ice::Int>(b.size());
write(Ice::Int(0));
}
void endSize()
{
assert(_sizePos >= 0);
- rewrite(b.size() - _sizePos - 4, _sizePos);
+ rewrite(static_cast<Ice::Int>(b.size()) - _sizePos - 4, _sizePos);
_sizePos = -1;
}