diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-17 09:51:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-17 09:51:47 -0400 |
commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/common/bit_set.h | |
parent | 3be048e50a2090caf1eeeb2373c7524ecc177ce8 (diff) | |
parent | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (diff) |
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/common/bit_set.h')
-rw-r--r-- | src/common/bit_set.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/bit_set.h b/src/common/bit_set.h index 5a197d8c1..5cd1352b2 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h @@ -170,14 +170,14 @@ public: m_val |= (IntTy)1 << bit; } - static BitSet AllTrue(size_t count) { + static BitSet AllTrue(std::size_t count) { return BitSet(count == sizeof(IntTy) * 8 ? ~(IntTy)0 : (((IntTy)1 << count) - 1)); } - Ref operator[](size_t bit) { + Ref operator[](std::size_t bit) { return Ref(this, (IntTy)1 << bit); } - const Ref operator[](size_t bit) const { + const Ref operator[](std::size_t bit) const { return (*const_cast<BitSet*>(this))[bit]; } bool operator==(BitSet other) const { |