diff options
| author | 2016-09-18 18:01:46 -0700 | |
|---|---|---|
| committer | 2016-09-18 21:14:25 -0700 | |
| commit | 396a8d91a4423d9c793eeff0798d544613647511 (patch) | |
| tree | e0203961233db1ffcbbca2e15154d71d142c5822 /src/common/bit_set.h | |
| parent | Tweak formatting settings (diff) | |
| download | yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.gz yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.xz yuzu-396a8d91a4423d9c793eeff0798d544613647511.zip | |
Manually tweak source formatting and then re-run clang-format
Diffstat (limited to '')
| -rw-r--r-- | src/common/bit_set.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/common/bit_set.h b/src/common/bit_set.h index b83cbbb36..c48b3b769 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h | |||
| @@ -102,10 +102,8 @@ public: | |||
| 102 | // A reference to a particular bit, returned from operator[]. | 102 | // A reference to a particular bit, returned from operator[]. |
| 103 | class Ref { | 103 | class Ref { |
| 104 | public: | 104 | public: |
| 105 | Ref(Ref&& other) : m_bs(other.m_bs), m_mask(other.m_mask) { | 105 | Ref(Ref&& other) : m_bs(other.m_bs), m_mask(other.m_mask) {} |
| 106 | } | 106 | Ref(BitSet* bs, IntTy mask) : m_bs(bs), m_mask(mask) {} |
| 107 | Ref(BitSet* bs, IntTy mask) : m_bs(bs), m_mask(mask) { | ||
| 108 | } | ||
| 109 | operator bool() const { | 107 | operator bool() const { |
| 110 | return (m_bs->m_val & m_mask) != 0; | 108 | return (m_bs->m_val & m_mask) != 0; |
| 111 | } | 109 | } |
| @@ -122,10 +120,8 @@ public: | |||
| 122 | // A STL-like iterator is required to be able to use range-based for loops. | 120 | // A STL-like iterator is required to be able to use range-based for loops. |
| 123 | class Iterator { | 121 | class Iterator { |
| 124 | public: | 122 | public: |
| 125 | Iterator(const Iterator& other) : m_val(other.m_val), m_bit(other.m_bit) { | 123 | Iterator(const Iterator& other) : m_val(other.m_val), m_bit(other.m_bit) {} |
| 126 | } | 124 | Iterator(IntTy val, int bit) : m_val(val), m_bit(bit) {} |
| 127 | Iterator(IntTy val, int bit) : m_val(val), m_bit(bit) { | ||
| 128 | } | ||
| 129 | Iterator& operator=(Iterator other) { | 125 | Iterator& operator=(Iterator other) { |
| 130 | new (this) Iterator(other); | 126 | new (this) Iterator(other); |
| 131 | return *this; | 127 | return *this; |
| @@ -160,10 +156,8 @@ public: | |||
| 160 | int m_bit; | 156 | int m_bit; |
| 161 | }; | 157 | }; |
| 162 | 158 | ||
| 163 | BitSet() : m_val(0) { | 159 | BitSet() : m_val(0) {} |
| 164 | } | 160 | explicit BitSet(IntTy val) : m_val(val) {} |
| 165 | explicit BitSet(IntTy val) : m_val(val) { | ||
| 166 | } | ||
| 167 | BitSet(std::initializer_list<int> init) { | 161 | BitSet(std::initializer_list<int> init) { |
| 168 | m_val = 0; | 162 | m_val = 0; |
| 169 | for (int bit : init) | 163 | for (int bit : init) |