diff options
| author |  Lioncash | 2019-03-20 23:48:34 -0400 |
|---|---|---|
| committer | Lioncash | 2019-03-20 23:48:37 -0400 |
| commit | 109b78a6d6c42a665ce9a86a2aca4166eadb0957 (patch) | |
| tree | 588e1d2377645215f70556744a568f9f44ee0e9e /src | |
| parent | Merge pull request #2090 from FearlessTobi/port-4599 (diff) | |
| download | yuzu-109b78a6d6c42a665ce9a86a2aca4166eadb0957.tar.gz yuzu-109b78a6d6c42a665ce9a86a2aca4166eadb0957.tar.xz yuzu-109b78a6d6c42a665ce9a86a2aca4166eadb0957.zip | |
common/bit_util: Fix bad merge duplicating the copy constructor
Introduced as a result of #2090, we already define the copy constructor
further down below, so this isn't needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/bit_field.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 8e35c463f..902e668e3 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h | |||
| @@ -125,8 +125,6 @@ private: | |||
| 125 | using StorageTypeWithEndian = typename AddEndian<StorageType, EndianTag>::type; | 125 | using StorageTypeWithEndian = typename AddEndian<StorageType, EndianTag>::type; |
| 126 | 126 | ||
| 127 | public: | 127 | public: |
| 128 | BitField& operator=(const BitField&) = default; | ||
| 129 | |||
| 130 | /// Constants to allow limited introspection of fields if needed | 128 | /// Constants to allow limited introspection of fields if needed |
| 131 | static constexpr std::size_t position = Position; | 129 | static constexpr std::size_t position = Position; |
| 132 | static constexpr std::size_t bits = Bits; | 130 | static constexpr std::size_t bits = Bits; |