diff options
| author |  raven02 | 2018-09-19 19:53:11 +0800 |
|---|---|---|
| committer |  GitHub | 2018-09-19 19:53:11 +0800 |
| commit | c8f9bbbf859c0e38cf691b64c67761382fcebfc2 (patch) | |
| tree | 99529c2277a6b740a6e278985c5147fa649c5497 /src/common/bit_set.h | |
| parent | Add 1D sampler for TLDS - TexelFetch (Mario Rabbids) (diff) | |
| parent | Merge pull request #1348 from ogniK5377/GetImageSize (diff) | |
| download | yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.gz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.xz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.zip | |
Merge branch 'master' into tlds
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 { |