mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-10-24 17:09:06 +00:00
Common/BitField: Make deleted functions public.
This commit is contained in:
parent
2dc975fa92
commit
845fecff22
1 changed files with 2 additions and 5 deletions
|
|
@ -119,13 +119,12 @@ template <std::size_t position, std::size_t bits, typename T,
|
||||||
std::type_identity<T>>::type>
|
std::type_identity<T>>::type>
|
||||||
struct BitField
|
struct BitField
|
||||||
{
|
{
|
||||||
private:
|
public:
|
||||||
// This constructor might be considered ambiguous:
|
// This constructor might be considered ambiguous:
|
||||||
// Would it initialize the storage or just the bitfield?
|
// Would it initialize the storage or just the bitfield?
|
||||||
// Hence, delete it. Use the assignment operator to set bitfield values!
|
// Hence, delete it. Use the assignment operator to set bitfield values!
|
||||||
BitField(T val) = delete;
|
BitField(T val) = delete;
|
||||||
|
|
||||||
public:
|
|
||||||
// Force default constructor to be created
|
// Force default constructor to be created
|
||||||
// so that we can use this within unions
|
// so that we can use this within unions
|
||||||
constexpr BitField() = default;
|
constexpr BitField() = default;
|
||||||
|
|
@ -214,18 +213,17 @@ template <std::size_t position, std::size_t bits, std::size_t size, typename T,
|
||||||
std::type_identity<T>>::type>
|
std::type_identity<T>>::type>
|
||||||
struct BitFieldArray
|
struct BitFieldArray
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
using Ref = BitFieldArrayRef<position, bits, size, T, StorageType>;
|
using Ref = BitFieldArrayRef<position, bits, size, T, StorageType>;
|
||||||
using ConstRef = BitFieldArrayConstRef<position, bits, size, T, StorageType>;
|
using ConstRef = BitFieldArrayConstRef<position, bits, size, T, StorageType>;
|
||||||
using Iterator = BitFieldArrayIterator<position, bits, size, T, StorageType>;
|
using Iterator = BitFieldArrayIterator<position, bits, size, T, StorageType>;
|
||||||
using ConstIterator = BitFieldArrayConstIterator<position, bits, size, T, StorageType>;
|
using ConstIterator = BitFieldArrayConstIterator<position, bits, size, T, StorageType>;
|
||||||
|
|
||||||
private:
|
|
||||||
// This constructor might be considered ambiguous:
|
// This constructor might be considered ambiguous:
|
||||||
// Would it initialize the storage or just the bitfield?
|
// Would it initialize the storage or just the bitfield?
|
||||||
// Hence, delete it. Use the assignment operator to set bitfield values!
|
// Hence, delete it. Use the assignment operator to set bitfield values!
|
||||||
BitFieldArray(T val) = delete;
|
BitFieldArray(T val) = delete;
|
||||||
|
|
||||||
public:
|
|
||||||
// Force default constructor to be created
|
// Force default constructor to be created
|
||||||
// so that we can use this within unions
|
// so that we can use this within unions
|
||||||
constexpr BitFieldArray() = default;
|
constexpr BitFieldArray() = default;
|
||||||
|
|
@ -238,7 +236,6 @@ public:
|
||||||
// code expects that this class is trivially copyable.
|
// code expects that this class is trivially copyable.
|
||||||
BitFieldArray& operator=(const BitFieldArray&) = delete;
|
BitFieldArray& operator=(const BitFieldArray&) = delete;
|
||||||
|
|
||||||
public:
|
|
||||||
constexpr bool IsSigned() const { return std::is_signed<T>(); }
|
constexpr bool IsSigned() const { return std::is_signed<T>(); }
|
||||||
constexpr std::size_t StartBit() const { return position; }
|
constexpr std::size_t StartBit() const { return position; }
|
||||||
constexpr std::size_t NumBits() const { return bits; }
|
constexpr std::size_t NumBits() const { return bits; }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue