diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-01-14 14:12:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-14 14:12:24 +0100 |
commit | f909e2e5f34357af78e28dd4d948134a0fee50aa (patch) | |
tree | 770198ebea3efde5371ac95686ec6b4dcb6c762f /vespalib | |
parent | 7d75ae24c6cbba6be53c065f59d4199b9a2b7924 (diff) | |
parent | 128ea9157d8374d493cdef3059abad1dbfbc11be (diff) |
Merge pull request #4638 from vespa-engine/revert-4635-revert-4601-balder/group-multiple-commits-rebased-1
Revert "Revert "Balder/group multiple commits rebased 1""
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/objects/nbostream.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.h b/vespalib/src/vespa/vespalib/objects/nbostream.h index 70a590f79d1..8eb42ddfd53 100644 --- a/vespalib/src/vespa/vespalib/objects/nbostream.h +++ b/vespalib/src/vespa/vespalib/objects/nbostream.h @@ -20,7 +20,7 @@ class nbostream public: using Buffer = Array<char>; using Alloc = alloc::Alloc; - enum State { ok=0, eof=0x01}; + enum State { ok=0, eof=0x01, oob=0x02}; nbostream(size_t initialSize=1024); protected: nbostream(const void * buf, size_t sz, bool longLivedBuffer); @@ -145,6 +145,7 @@ public: const char * peek() const { return &_rbuf[_rp]; } size_t rp() const { return _rp; } nbostream & rp(size_t pos) { if (pos > _wp) fail(eof); _rp = pos; return *this; } + nbostream & wp(size_t pos) { if (pos > _wbuf.size()) fail(oob); _wp = pos; return *this; } size_t wp() const { return _wp; } State state() const { return _state; } bool good() const { return _state == ok; } |