ICE-5481 use size_type for Stream startSize() return type

4 files changed, 9 insertions, 9 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index a6e75c7fbd5..75e43ad8026 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -400,14 +400,14 @@ public:
 
     Ice::Int readAndCheckSeqSize(int);
 
-    int startSize()
+    size_type startSize()
     {
-        int pos = static_cast<Ice::Int>(b.size());
+        size_type pos = b.size();
         write(Ice::Int(0));
         return pos;
     }
 
-    void endSize(int pos)
+    void endSize(size_type pos)
     {
         assert(pos >= 0);
         rewrite(static_cast<Ice::Int>(b.size()) - pos - 4, pos);
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index 830442ddde7..638fb80d705 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -351,8 +351,8 @@ public:
 
     virtual bool writeOptional(Int, OptionalFormat) = 0;
 
-    virtual int startSize() = 0;
-    virtual void endSize(int pos) = 0;
+    virtual size_type startSize() = 0;
+    virtual void endSize(size_type pos) = 0;
 
     template<typename T> inline void write(const T& v)
     {
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index eb3ae4f13ae..f889f71b8be 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -729,14 +729,14 @@ OutputStreamI::rewrite(Int sz, size_type p)
     _os->rewrite(sz, p);
 }
 
-int
+OutputStream::size_type
 OutputStreamI::startSize()
 {
     return _os->startSize();
 }
 
 void
-OutputStreamI::endSize(int pos)
+OutputStreamI::endSize(OutputStream::size_type pos)
 {
     _os->endSize(pos);
 }
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index 88f9893c96f..103d917cc3e 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -183,8 +183,8 @@ public:
     virtual size_type pos();
     virtual void rewrite(Int, size_type);
 
-    virtual int startSize();
-    virtual void endSize(int pos);
+    virtual size_type startSize();
+    virtual void endSize(size_type pos);
 
 private: