Jelajahi Sumber

actually, temporarily revert my "operator WType" too, Python uses it for bool evaluation too

rdb 13 tahun lalu
induk
melakukan
4818adb5ed
2 mengubah file dengan 0 tambahan dan 14 penghapusan
  1. 0 12
      panda/src/putil/bitMask.I
  2. 0 2
      panda/src/putil/bitMask.h

+ 0 - 12
panda/src/putil/bitMask.I

@@ -821,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<class WType, int nbits>
-INLINE BitMask<WType, nbits>::
-operator WType () const {
-  return _word;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: BitMask::get_key
 //       Access: Published

+ 0 - 2
panda/src/putil/bitMask.h

@@ -118,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<WType, nbits> flood_bits_down() const;