diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/ByteBuffer.h | 26 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h index 9bdd6067fbc..efd704a4904 100644 --- a/src/shared/ByteBuffer.h +++ b/src/shared/ByteBuffer.h @@ -243,6 +243,32 @@ class ByteBuffer _rpos += len; } + bool readPackGUID(uint64& guid) + { + if(rpos()+1 > size()) + return false; + + guid = 0; + + uint8 guidmark=0; + (*this) >> guidmark; + + for(int i=0;i<8;i++) + { + if(guidmark & (uint8(1) << i)) + { + if(rpos()+1 > size()) + return false; + + uint8 bit; + (*this) >> bit; + guid |= (uint64(bit) << (i*8)); + } + } + + return true; + } + const uint8 *contents() const { return &_storage[0]; } size_t size() const { return _storage.size(); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ce7f38e6f56..f90b03cc3a6 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6949" + #define REVISION_NR "6955" #endif // __REVISION_NR_H__ |