diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/bitunion.hh | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/base/bitunion.hh b/src/base/bitunion.hh index 190c1a5e1..c4b67b073 100644 --- a/src/base/bitunion.hh +++ b/src/base/bitunion.hh @@ -100,6 +100,12 @@ namespace BitfieldBackend this->setBits(first, last, _data); return _data; } + + uint64_t + operator=(Bitfield<first, last> const & other) + { + return *this = (uint64_t)other; + } }; //A class which specializes the above so that it can only be read @@ -113,6 +119,9 @@ namespace BitfieldBackend private: uint64_t operator=(const uint64_t _data); + + uint64_t + operator=(const Bitfield<first, last>& other); }; //Similar to the above, but only allows writing. @@ -150,6 +159,12 @@ namespace BitfieldBackend this->setBits(first, last, _data); return _data; } + + int64_t + operator=(SignedBitfield<first, last> const & other) + { + return *this = (int64_t)other; + } }; //A class which specializes the above so that it can only be read @@ -163,6 +178,9 @@ namespace BitfieldBackend private: int64_t operator=(const int64_t _data); + + int64_t + operator=(const SignedBitfield<first, last>& other); }; //Similar to the above, but only allows writing. @@ -173,11 +191,7 @@ namespace BitfieldBackend operator const int64_t () const; public: - int64_t operator=(const int64_t _data) - { - *((SignedBitfield<first, last> *)this) = _data; - return _data; - } + using SignedBitfield<first, last>::operator=; }; }; @@ -215,6 +229,13 @@ namespace BitfieldBackend return _data; } + Type + operator=(BitUnionOperators const & other) + { + Base::__data = other; + return Base::__data; + } + bool operator<(Base const & base) const { |