diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx index 4804d5408a..8c8a945fce 100644 --- a/panda/src/collide/collisionTraverser.cxx +++ b/panda/src/collide/collisionTraverser.cxx @@ -624,8 +624,8 @@ r_traverse_single(CollisionLevelStateSingle &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - cnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + cnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif @@ -669,8 +669,8 @@ r_traverse_single(CollisionLevelStateSingle &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - gnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + gnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif @@ -841,8 +841,8 @@ r_traverse_double(CollisionLevelStateDouble &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - cnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + cnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif @@ -886,8 +886,8 @@ r_traverse_double(CollisionLevelStateDouble &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - gnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + gnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif @@ -1058,8 +1058,8 @@ r_traverse_quad(CollisionLevelStateQuad &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - cnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + cnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif @@ -1103,8 +1103,8 @@ r_traverse_quad(CollisionLevelStateQuad &level_state, size_t pass) { if (level_state.has_collider(c)) { entry._from_node = level_state.get_collider_node(c); - if (entry._from_node->get_from_collide_mask() & - gnode->get_into_collide_mask()) { + if ((entry._from_node->get_from_collide_mask() & + gnode->get_into_collide_mask()) != 0) { #ifdef DO_PSTATS //PStatTimer collide_timer(_solid_collide_collectors[pass]); #endif diff --git a/panda/src/putil/bitArray.I b/panda/src/putil/bitArray.I index f3b4fc2a34..2389b39406 100755 --- a/panda/src/putil/bitArray.I +++ b/panda/src/putil/bitArray.I @@ -411,18 +411,6 @@ clear() { _highest_bits = 0; } -//////////////////////////////////////////////////////////////////// -// Function: BitArray::operator bool -// Access: Published -// Description: The bool typecast operator returns true if any bits -// are set, false if none of them is set. That is, true -// if nonzero, false if zero. -//////////////////////////////////////////////////////////////////// -INLINE BitArray:: -operator bool () const { - return !is_zero(); -} - //////////////////////////////////////////////////////////////////// // Function: BitArray::operator == // Access: Published diff --git a/panda/src/putil/bitArray.h b/panda/src/putil/bitArray.h index 3e9fa157fb..3a1a85f187 100755 --- a/panda/src/putil/bitArray.h +++ b/panda/src/putil/bitArray.h @@ -102,7 +102,6 @@ PUBLISHED: void output_hex(ostream &out, int spaces_every = 4) const; void write(ostream &out, int indent_level = 0) const; - INLINE operator bool () const; INLINE bool operator == (const BitArray &other) const; INLINE bool operator != (const BitArray &other) const; INLINE bool operator < (const BitArray &other) const; diff --git a/panda/src/putil/bitMask.I b/panda/src/putil/bitMask.I index 142c30aff0..ffaf45052d 100644 --- a/panda/src/putil/bitMask.I +++ b/panda/src/putil/bitMask.I @@ -631,19 +631,6 @@ write(ostream &out, int indent_level) const { indent(out, indent_level) << *this << "\n"; } -//////////////////////////////////////////////////////////////////// -// Function: BitMask::operator bool -// Access: Published -// Description: The bool typecast operator returns true if any bits -// are set, false if none of them is set. That is, true -// if nonzero, false if zero. -//////////////////////////////////////////////////////////////////// -template -INLINE BitMask:: -operator bool () const { - return !is_zero(); -} - //////////////////////////////////////////////////////////////////// // Function: BitMask::operator == // Access: Published diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h index fcec8ae8b9..2a3e494236 100644 --- a/panda/src/putil/bitMask.h +++ b/panda/src/putil/bitMask.h @@ -89,7 +89,6 @@ PUBLISHED: void output_hex(ostream &out, int spaces_every = 4) const; void write(ostream &out, int indent_level = 0) const; - INLINE operator bool () const; INLINE bool operator == (const BitMask &other) const; INLINE bool operator != (const BitMask &other) const; INLINE bool operator < (const BitMask &other) const; diff --git a/panda/src/putil/doubleBitMask.I b/panda/src/putil/doubleBitMask.I index 55acf9b193..05febb27e2 100644 --- a/panda/src/putil/doubleBitMask.I +++ b/panda/src/putil/doubleBitMask.I @@ -646,19 +646,6 @@ write(ostream &out, int indent_level) const { indent(out, indent_level) << *this << "\n"; } -//////////////////////////////////////////////////////////////////// -// Function: DoubleBitMask::operator bool -// Access: Published -// Description: The bool typecast operator returns true if any bits -// are set, false if none of them is set. That is, true -// if nonzero, false if zero. -//////////////////////////////////////////////////////////////////// -template -INLINE DoubleBitMask:: -operator bool () const { - return !is_zero(); -} - //////////////////////////////////////////////////////////////////// // Function: DoubleBitMask::operator == // Access: Published diff --git a/panda/src/putil/doubleBitMask.h b/panda/src/putil/doubleBitMask.h index c9b1cf9ca3..bed4fa19ef 100644 --- a/panda/src/putil/doubleBitMask.h +++ b/panda/src/putil/doubleBitMask.h @@ -89,7 +89,6 @@ PUBLISHED: void output_hex(ostream &out, int spaces_every = 4) const; void write(ostream &out, int indent_level = 0) const; - INLINE operator bool () const; INLINE bool operator == (const DoubleBitMask &other) const; INLINE bool operator != (const DoubleBitMask &other) const; INLINE bool operator < (const DoubleBitMask &other) const; diff --git a/panda/src/putil/sparseArray.I b/panda/src/putil/sparseArray.I index 744498b806..ed72375e8c 100644 --- a/panda/src/putil/sparseArray.I +++ b/panda/src/putil/sparseArray.I @@ -360,18 +360,6 @@ clear() { _inverse = false; } -//////////////////////////////////////////////////////////////////// -// Function: SparseArray::operator bool -// Access: Published -// Description: The bool typecast operator returns true if any bits -// are set, false if none of them is set. That is, true -// if nonzero, false if zero. -//////////////////////////////////////////////////////////////////// -INLINE SparseArray:: -operator bool () const { - return !is_zero(); -} - //////////////////////////////////////////////////////////////////// // Function: SparseArray::operator == // Access: Published diff --git a/panda/src/putil/sparseArray.h b/panda/src/putil/sparseArray.h index a8c54644f3..b2d4bda0e9 100644 --- a/panda/src/putil/sparseArray.h +++ b/panda/src/putil/sparseArray.h @@ -93,7 +93,6 @@ PUBLISHED: void output(ostream &out) const; - INLINE operator bool () const; INLINE bool operator == (const SparseArray &other) const; INLINE bool operator != (const SparseArray &other) const; INLINE bool operator < (const SparseArray &other) const;