summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Moore <DrChat@users.noreply.github.com>2017-07-05 20:43:39 -0500
committerGitHub <noreply@github.com>2017-07-05 20:43:39 -0500
commit969b4df7dd187e1b652ced002659ab65116631e1 (patch)
tree44db74e72ed5c16b8f900425d012f746b6d12d83
parent283b7bc1b49a0d5a343155802df25599021a6f21 (diff)
parent2d13fdd681b52a05468b3de1be32a8f6b003fa9a (diff)
Merge pull request #744 from drillsar/patch
32-bit value fix to the 64-bit type.
-rw-r--r--src/xenia/base/bit_stream.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xenia/base/bit_stream.cc b/src/xenia/base/bit_stream.cc
index 70a9f1a23..ce74937dd 100644
--- a/src/xenia/base/bit_stream.cc
+++ b/src/xenia/base/bit_stream.cc
@@ -53,7 +53,7 @@ uint64_t BitStream::Peek(size_t num_bits) {
// AND with mask
// ...................| target bits |
- bits &= (1 << num_bits) - 1;
+ bits &= (1ULL << num_bits) - 1;
return bits;
}
@@ -74,7 +74,7 @@ bool BitStream::Write(uint64_t val, size_t num_bits) {
size_t rel_offset_bits = offset_bits_ - (offset_bytes << 3);
// Construct a mask
- uint64_t mask = (1 << num_bits) - 1;
+ uint64_t mask = (1ULL << num_bits) - 1;
mask <<= 64 - (rel_offset_bits + num_bits);
mask = ~mask;