Merge pull request #593 from yahoo/balder/nbostream-must-support-more-than-2G

Balder/nbostream must support more than 2 g

3 files changed, 9 insertions, 9 deletions

diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.cpp b/vespalib/src/vespa/vespalib/objects/nbostream.cpp
index 40df53b377e..12755dcd865 100644
--- a/vespalib/src/vespa/vespalib/objects/nbostream.cpp
+++ b/vespalib/src/vespa/vespalib/objects/nbostream.cpp
@@ -23,7 +23,7 @@ std::ostream & operator << (std::ostream & os, const HexDump & hd)
 void nbostream::fail(State s)
 {
     _state = static_cast<State>(_state | s);
-    throw IllegalStateException(vespalib::make_string("Stream failed bufsize(%lu), readp(%d), writep(%d)", (unsigned long)_wbuf.size(), _rp, _wp), VESPA_STRLOC);
+    throw IllegalStateException(make_string("Stream failed bufsize(%zu), readp(%zu), writep(%zu)", _wbuf.size(), _rp, _wp), VESPA_STRLOC);
 }
 
 void nbostream::reserve(size_t sz)
diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.h b/vespalib/src/vespa/vespalib/objects/nbostream.h
index b905e586c9f..b68a5d3cacb 100644
--- a/vespalib/src/vespa/vespalib/objects/nbostream.h
+++ b/vespalib/src/vespa/vespalib/objects/nbostream.h
@@ -235,7 +235,7 @@ class nbostream
     State state() const { return _state; }
     bool good() const { return _state == ok; }
     void clear()        { _wbuf.clear(); _wp = _rp = 0; _state = ok; }
-    void adjustReadPos(ssize_t adj) { uint32_t npos = _rp + adj; if (__builtin_expect(npos > _wp, false)) { fail(eof); } _rp = npos; }
+    void adjustReadPos(ssize_t adj) { size_t npos = _rp + adj; if (__builtin_expect(npos > _wp, false)) { fail(eof); } _rp = npos; }
     friend std::ostream & operator << (std::ostream & os, const nbostream & s) { return os << HexDump(&s._rbuf[s._rp], s.left()); }
     static bool     n2h(bool v)     { return v; }
     static int8_t   n2h(int8_t v)   { return v; }
@@ -318,14 +318,14 @@ class nbostream
     void write4(const void *v) { write(v, 4); }
     void write8(const void *v) { write(v, 8); }
     void fail(State s);
-    uint32_t left()  const { return _wp - _rp; }
-    uint32_t space() const { return _wbuf.size() - _wp; }
+    size_t left()  const { return _wp - _rp; }
+    size_t space() const { return _wbuf.size() - _wp; }
     void compact();
     void extend(size_t newSize);
     Buffer         _wbuf;
     ConstBufferRef _rbuf;
-    uint32_t       _rp;
-    uint32_t       _wp;
+    size_t         _rp;
+    size_t         _wp;
     State          _state;
     const bool     _longLivedBuffer;
 };
diff --git a/vespalib/src/vespa/vespalib/util/array.h b/vespalib/src/vespa/vespalib/util/array.h
index d2741dba29b..8f40d4de0c7 100644
--- a/vespalib/src/vespa/vespalib/util/array.h
+++ b/vespalib/src/vespa/vespalib/util/array.h
@@ -176,8 +176,8 @@ public:
     bool operator == (const Array & rhs) const;
     bool operator != (const Array & rhs) const { return !(*this == rhs); }
 private:
-    T *       array(uint32_t i)       { return static_cast<T *>(_array.get()) + i; }
-    const T * array(uint32_t i) const { return static_cast<const T *>(_array.get()) + i; }
+    T *       array(size_t i)       { return static_cast<T *>(_array.get()) + i; }
+    const T * array(size_t i) const { return static_cast<const T *>(_array.get()) + i; }
     void cleanup();
     void increase(size_t n);
     void extend(size_t n) {
@@ -186,7 +186,7 @@ private:
         }
     }
     B        _array;
-    uint32_t _sz;
+    size_t _sz;
 };
 
 template <typename T>