diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/bitset.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/util/bitset.h b/src/util/bitset.h index 7bb5f3c83cf..b4c21520238 100644 --- a/src/util/bitset.h +++ b/src/util/bitset.h @@ -142,23 +142,6 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp, * it as, and N is the number of bits in the bitset. */ #define DECLARE_BITSET_T(T, N) struct T { \ - /* XXX - Replace this with an implicitly-defined \ - * constructor when support for C++11 defaulted \ - * constructors can be assumed (available on GCC 4.4 and \ - * later) in order to make the object trivially \ - * constructible like a fundamental integer type for \ - * convenience. \ - */ \ - T() \ - { \ - } \ - \ - T(BITSET_WORD x) \ - { \ - for (unsigned i = 0; i < BITSET_WORDS(N); i++, x = 0) \ - words[i] = x; \ - } \ - \ EXPLICIT_CONVERSION \ operator bool() const \ { \ @@ -168,6 +151,13 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp, return false; \ } \ \ + T & \ + operator=(int x) \ + { \ + const T c = {{ (BITSET_WORD)x }}; \ + return *this = c; \ + } \ + \ friend bool \ operator==(const T &b, const T &c) \ { \ @@ -180,6 +170,19 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp, return !(b == c); \ } \ \ + friend bool \ + operator==(const T &b, int x) \ + { \ + const T c = {{ (BITSET_WORD)x }}; \ + return b == c; \ + } \ + \ + friend bool \ + operator!=(const T &b, int x) \ + { \ + return !(b == x); \ + } \ + \ friend T \ operator~(const T &b) \ { \ |