OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 21:40:04 +00:00
Code Issues Projects Releases Wiki Activity

Make bitfield assignment operator public

Browse Source 
This change needs to be made to get the code compiling again. It was suggested after a conversation with Lioncash.

The conversation can be seen here: https://user-images.githubusercontent.com/20753089/45064197-b6107800-b0b2-11e8-9db8-f696299fb86a.PNG
This commit is contained in:
fearlessTobi 2018-09-05 02:24:44 +02:00
parent f3f4871275
commit c7d8ffd14f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/bit_field.h
View File

@ -111,12 +111,6 @@
template <std::size_t Position, std::size_t Bits, typename T> template <std::size_t Position, std::size_t Bits, typename T>
struct BitField { struct BitField {
private: private:
// We hide the copy assigment operator here, because the default copy
// assignment would copy the full storage value, rather than just the bits
// relevant to this particular bit field.
// We don't delete it because we want BitField to be trivially copyable.
BitField& operator=(const BitField&) = default;
// StorageType is T for non-enum types and the underlying type of T if // StorageType is T for non-enum types and the underlying type of T if
// T is an enumeration. Note that T is wrapped within an enable_if in the // T is an enumeration. Note that T is wrapped within an enable_if in the
// former case to workaround compile errors which arise when using // former case to workaround compile errors which arise when using
@ -128,6 +122,8 @@ private:
using StorageTypeU = std::make_unsigned_t<StorageType>; using StorageTypeU = std::make_unsigned_t<StorageType>;
public: public:
BitField& operator=(const BitField&) = default;
/// Constants to allow limited introspection of fields if needed /// Constants to allow limited introspection of fields if needed
static constexpr size_t position = Position; static constexpr size_t position = Position;
static constexpr size_t bits = Bits; static constexpr size_t bits = Bits;