summaryrefslogtreecommitdiff
path: root/src/mongo/s/chunk_version.h
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2018-09-10 17:23:46 -0400
committerRandolph Tan <randolph@10gen.com>2018-09-18 14:53:45 -0400
commit0b92be077a7219bbda6bf737b9751df4dbf83559 (patch)
tree5c8155e7704bcaee75b12a7660568f395be3ef64 /src/mongo/s/chunk_version.h
parent1dc8031b266660d3b2a0fc04c77804219df96d36 (diff)
downloadmongo-0b92be077a7219bbda6bf737b9751df4dbf83559.tar.gz
SERVER-36987 ChunkVersion::minorVersion truncates to 16 bit
(cherry picked from commit cf3e9512586e2538833b248895cd14844f5fbd65)
Diffstat (limited to 'src/mongo/s/chunk_version.h')
-rw-r--r--src/mongo/s/chunk_version.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/s/chunk_version.h b/src/mongo/s/chunk_version.h
index 1c5a811b04d..600b5937d02 100644
--- a/src/mongo/s/chunk_version.h
+++ b/src/mongo/s/chunk_version.h
@@ -59,7 +59,7 @@ public:
ChunkVersion() : _combined(0), _epoch(OID()) {}
- ChunkVersion(int major, int minor, const OID& epoch)
+ ChunkVersion(uint32_t major, uint32_t minor, const OID& epoch)
: _combined(static_cast<uint64_t>(minor) | (static_cast<uint64_t>(major) << 32)),
_epoch(epoch) {}
@@ -157,12 +157,12 @@ public:
return _combined > 0;
}
- int majorVersion() const {
+ uint32_t majorVersion() const {
return _combined >> 32;
}
- int minorVersion() const {
- return _combined & 0xFFFF;
+ uint32_t minorVersion() const {
+ return _combined & 0xFFFFFFFF;
}
OID epoch() const {