diff options
| author | 2018-09-17 09:51:47 -0400 | |
|---|---|---|
| committer | 2018-09-17 09:51:47 -0400 | |
| commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
| tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/common/bit_set.h | |
| parent | Merge pull request #1329 from raven02/bgr5a1u (diff) | |
| parent | Port #4182 from Citra: "Prefix all size_t with std::" (diff) | |
| download | yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.gz yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.xz yuzu-076add4ccddff3940e20fc320615e3d330f77119.zip | |
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: | |||
| 170 | m_val |= (IntTy)1 << bit; | 170 | m_val |= (IntTy)1 << bit; |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | static BitSet AllTrue(size_t count) { | 173 | static BitSet AllTrue(std::size_t count) { |
| 174 | return BitSet(count == sizeof(IntTy) * 8 ? ~(IntTy)0 : (((IntTy)1 << count) - 1)); | 174 | return BitSet(count == sizeof(IntTy) * 8 ? ~(IntTy)0 : (((IntTy)1 << count) - 1)); |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | Ref operator[](size_t bit) { | 177 | Ref operator[](std::size_t bit) { |
| 178 | return Ref(this, (IntTy)1 << bit); | 178 | return Ref(this, (IntTy)1 << bit); |
| 179 | } | 179 | } |
| 180 | const Ref operator[](size_t bit) const { | 180 | const Ref operator[](std::size_t bit) const { |
| 181 | return (*const_cast<BitSet*>(this))[bit]; | 181 | return (*const_cast<BitSet*>(this))[bit]; |
| 182 | } | 182 | } |
| 183 | bool operator==(BitSet other) const { | 183 | bool operator==(BitSet other) const { |