mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-03-14 05:20:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverting this whole mess

Browse Source
This commit is contained in:
rdb
2012-03-20 14:32:14 +00:00
parent d9ef0f11ae
commit 7978472f00
2 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
panda/src/putil/bitMask.I
View File

@@ -690,65 +690,6 @@ compare_to(const BitMask<WType, nbits> &other) const {
}
}
////////////////////////////////////////////////////////////////////
// Function: BitMask::operator ==
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
template<class WType, int nbits>
INLINE bool BitMask<WType, nbits>::
operator == (WordType other) const {
return _word == other;
}
////////////////////////////////////////////////////////////////////
// Function: BitMask::operator !=
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
template<class WType, int nbits>
INLINE bool BitMask<WType, nbits>::
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<class WType, int nbits>
INLINE bool BitMask<WType, nbits>::
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<class WType, int nbits>
INLINE int BitMask<WType, nbits>::
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<class WType, int nbits>
INLINE BitMask<WType, nbits>::
operator WType () const {
return _word;
}
////////////////////////////////////////////////////////////////////
// Function: BitMask::get_key
// Access: Published

7
panda/src/putil/bitMask.h
View File

@@ -94,11 +94,6 @@ PUBLISHED:
INLINE bool operator < (const BitMask<WType, nbits> &other) const;
INLINE int compare_to(const BitMask<WType, nbits> &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<WType, nbits>
operator & (const BitMask<WType, nbits> &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<WType, nbits> flood_bits_down() const;