Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 20:46:03 +08:00
Code Activity

Fixed more bitvec issues for GCC 4.7 and Clang.

Browse Source
This commit is contained in:
Nicholas Hastings
2012-12-23 22:05:33 -05:00
parent cc5b58ef68
commit 37242fb231
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/bitvec.h
View File

@ -683,8 +683,8 @@ inline uint32 CBitVecT<BASE_OPS>::Get( uint32 offset, uint32 mask )
template <class BASE_OPS> template <class BASE_OPS>
inline void CBitVecT<BASE_OPS>::And(const CBitVecT &addStr, CBitVecT *out) const inline void CBitVecT<BASE_OPS>::And(const CBitVecT &addStr, CBitVecT *out) const
{ {
ValidateOperand( addStr ); this->ValidateOperand( addStr );
ValidateOperand( *out ); this->ValidateOperand( *out );
uint32 * pDest = out->Base(); uint32 * pDest = out->Base();
const uint32 *pOperand1 = this->Base(); const uint32 *pOperand1 = this->Base();
@ -704,8 +704,8 @@ inline void CBitVecT<BASE_OPS>::And(const CBitVecT &addStr, CBitVecT *out) const
template <class BASE_OPS> template <class BASE_OPS>
inline void CBitVecT<BASE_OPS>::Or(const CBitVecT &orStr, CBitVecT *out) const inline void CBitVecT<BASE_OPS>::Or(const CBitVecT &orStr, CBitVecT *out) const
{ {
ValidateOperand( orStr ); this->ValidateOperand( orStr );
ValidateOperand( *out ); this->ValidateOperand( *out );
uint32 * pDest = out->Base(); uint32 * pDest = out->Base();
const uint32 *pOperand1 = this->Base(); const uint32 *pOperand1 = this->Base();
@ -743,7 +743,7 @@ inline void CBitVecT<BASE_OPS>::Xor(const CBitVecT &xorStr, CBitVecT *out) const
template <class BASE_OPS> template <class BASE_OPS>
inline void CBitVecT<BASE_OPS>::Not(CBitVecT *out) const inline void CBitVecT<BASE_OPS>::Not(CBitVecT *out) const
{ {
ValidateOperand( *out ); this->ValidateOperand( *out );
uint32 * pDest = out->Base(); uint32 * pDest = out->Base();
const uint32 *pOperand = this->Base(); const uint32 *pOperand = this->Base();
@ -764,7 +764,7 @@ inline void CBitVecT<BASE_OPS>::CopyTo(CBitVecT *out) const
{ {
out->Resize( this->GetNumBits() ); out->Resize( this->GetNumBits() );
ValidateOperand( *out ); this->ValidateOperand( *out );
Assert( out != this ); Assert( out != this );
memcpy( out->Base(), this->Base(), this->GetNumDWords() * sizeof( int ) ); memcpy( out->Base(), this->Base(), this->GetNumDWords() * sizeof( int ) );
@ -851,7 +851,7 @@ inline void CBitVecT<BASE_OPS>::Copy( const CBitVecT<BASE_OPS> &other, int nBits
this->Resize( nBits ); this->Resize( nBits );
ValidateOperand( other ); this->ValidateOperand( other );
Assert( &other != this ); Assert( &other != this );
memcpy( this->Base(), other.Base(), this->GetNumDWords() * sizeof( uint32 ) ); memcpy( this->Base(), other.Base(), this->GetNumDWords() * sizeof( uint32 ) );