diff --git a/panda/src/putil/bitMask.I b/panda/src/putil/bitMask.I index bb742b5ac4..9c7de08321 100644 --- a/panda/src/putil/bitMask.I +++ b/panda/src/putil/bitMask.I @@ -690,65 +690,6 @@ compare_to(const BitMask &other) const { } } -//////////////////////////////////////////////////////////////////// -// Function: BitMask::operator == -// Access: Published -// Description: -//////////////////////////////////////////////////////////////////// -template -INLINE bool BitMask:: -operator == (WordType other) const { - return _word == other; -} - -//////////////////////////////////////////////////////////////////// -// Function: BitMask::operator != -// Access: Published -// Description: -//////////////////////////////////////////////////////////////////// -template -INLINE bool BitMask:: -operator != (WordType other) const { - return _word != other; -} - -//////////////////////////////////////////////////////////////////// -// Function: BitMask::operator < -// Access: Published -// Description: The ordering operator is of limited usefulness with a -// BitMask, however, it has a definition which places -// all unique BitMasks into a unique ordering. It may -// be useful when defining ordered STL containers of -// BitMasks, for instance; and it's required in order to -// export any STL container (ordered or unordered) of -// BitMask under Windows. -//////////////////////////////////////////////////////////////////// -template -INLINE bool BitMask:: -operator < (WordType other) const { - return _word < other; -} - -//////////////////////////////////////////////////////////////////// -// Function: BitMask::compare_to -// Access: Published -// Description: Returns a number less than zero if this BitMask sorts -// before the indicated other BitMask, greater than zero -// if it sorts after, or 0 if they are equivalent. This -// is based on the same ordering defined by operator <. -//////////////////////////////////////////////////////////////////// -template -INLINE int BitMask:: -compare_to(WordType other) const { - if ((*this) < other) { - return -1; - } else if (other < (*this)) { - return 1; - } else { - return 0; - } -} - //////////////////////////////////////////////////////////////////// // Function: BitMask::operator & // Access: Published @@ -880,18 +821,6 @@ operator >>= (int shift) { _word >>= shift; } -//////////////////////////////////////////////////////////////////// -// Function: BitMask::operator WType -// Access: Published -// Description: Used to cast this BitMask back into the -// underlying integer type. -//////////////////////////////////////////////////////////////////// -template -INLINE BitMask:: -operator WType () const { - return _word; -} - //////////////////////////////////////////////////////////////////// // Function: BitMask::get_key // Access: Published diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h index 2aecc198d9..fdc3b58fc1 100644 --- a/panda/src/putil/bitMask.h +++ b/panda/src/putil/bitMask.h @@ -94,11 +94,6 @@ PUBLISHED: INLINE bool operator < (const BitMask &other) const; INLINE int compare_to(const BitMask &other) const; - INLINE bool operator == (WordType other) const; - INLINE bool operator != (WordType other) const; - INLINE bool operator < (WordType other) const; - INLINE int compare_to(WordType other) const; - INLINE BitMask operator & (const BitMask &other) const; @@ -123,8 +118,6 @@ PUBLISHED: INLINE void operator <<= (int shift); INLINE void operator >>= (int shift); - INLINE operator WType () const; - INLINE void flood_down_in_place(); INLINE void flood_up_in_place(); INLINE BitMask flood_bits_down() const;