mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-10 20:03:08 +08:00
Compatibility fixes for Clang 22
This commit is contained in:
+3
-3
@@ -448,7 +448,7 @@ typedef CBitVec<32> CDWordBitVec;
|
||||
template <typename BITCOUNTTYPE>
|
||||
inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase()
|
||||
{
|
||||
Plat_FastMemset( this, 0, sizeof( *this ) );
|
||||
Plat_FastMemset( (void *)this, 0, sizeof( *this ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -479,7 +479,7 @@ inline CVarBitVecBase<BITCOUNTTYPE>::CVarBitVecBase( const CVarBitVecBase<BITCOU
|
||||
memcpy( m_pInt, from.m_pInt, m_numInts * sizeof(int) );
|
||||
}
|
||||
else
|
||||
memset( this, 0, sizeof( *this ) );
|
||||
memset( (void *)this, 0, sizeof( *this ) );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -547,7 +547,7 @@ inline bool CVarBitVecBase<BITCOUNTTYPE>::Detach( uint32 **ppBits, int *pNumBits
|
||||
free( m_pInt );
|
||||
}
|
||||
|
||||
memset( this, 0, sizeof( *this ) );
|
||||
memset( (void *)this, 0, sizeof( *this ) );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -240,7 +240,7 @@ CBasePhonemeTag::CBasePhonemeTag()
|
||||
|
||||
CBasePhonemeTag::CBasePhonemeTag( const CBasePhonemeTag& from )
|
||||
{
|
||||
memcpy( this, &from, sizeof(*this) );
|
||||
memcpy( (void *)this, &from, sizeof(*this) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ public:
|
||||
CBasePhonemeTag();
|
||||
CBasePhonemeTag( const CBasePhonemeTag& from );
|
||||
|
||||
CBasePhonemeTag &operator=( const CBasePhonemeTag &from ) { memcpy( this, &from, sizeof(*this) ); return *this; }
|
||||
CBasePhonemeTag &operator=( const CBasePhonemeTag &from ) { memcpy( (void *)this, &from, sizeof(*this) ); return *this; }
|
||||
|
||||
float GetStartTime() const { return m_flStartTime; }
|
||||
void SetStartTime( float startTime ) { m_flStartTime = startTime; }
|
||||
|
||||
+2
-2
@@ -3170,7 +3170,7 @@ inline int Studio_LoadVertexes( const vertexFileHeader_t *pTempVvdHdr, vertexFil
|
||||
|
||||
// copy vertexes
|
||||
memcpy(
|
||||
(mstudiovertex_t *)((byte *)pNewVvdHdr+pNewVvdHdr->vertexDataStart) + target,
|
||||
(void *)((mstudiovertex_t *)((byte *)pNewVvdHdr+pNewVvdHdr->vertexDataStart) + target),
|
||||
(mstudiovertex_t *)((byte *)pTempVvdHdr+pTempVvdHdr->vertexDataStart) + pFixupTable[i].sourceVertexID,
|
||||
pFixupTable[i].numVertexes*sizeof(mstudiovertex_t) );
|
||||
|
||||
@@ -3178,7 +3178,7 @@ inline int Studio_LoadVertexes( const vertexFileHeader_t *pTempVvdHdr, vertexFil
|
||||
{
|
||||
// copy tangents
|
||||
memcpy(
|
||||
(Vector4D *)((byte *)pNewVvdHdr+pNewVvdHdr->tangentDataStart) + target,
|
||||
(void *)((Vector4D *)((byte *)pNewVvdHdr+pNewVvdHdr->tangentDataStart) + target),
|
||||
(Vector4D *)((byte *)pTempVvdHdr+pTempVvdHdr->tangentDataStart) + pFixupTable[i].sourceVertexID,
|
||||
pFixupTable[i].numVertexes*sizeof(Vector4D) );
|
||||
}
|
||||
|
||||
@@ -1157,7 +1157,7 @@ inline uint64 Plat_Rdtsc()
|
||||
public: \
|
||||
_classname &operator=( const _classname &src ) \
|
||||
{ \
|
||||
memcpy( this, &src, sizeof(_classname) ); \
|
||||
memcpy( (void *)this, &src, sizeof(_classname) ); \
|
||||
return *this; \
|
||||
}
|
||||
|
||||
|
||||
@@ -1068,7 +1068,7 @@ private:
|
||||
class ALIGN8 PLATFORM_CLASS CThreadSpinRWLock
|
||||
{
|
||||
public:
|
||||
CThreadSpinRWLock() { COMPILE_TIME_ASSERT( sizeof( LockInfo_t ) == sizeof( int64 ) ); Assert( (intp)this % 8 == 0 ); memset( this, 0, sizeof( *this ) ); }
|
||||
CThreadSpinRWLock() { COMPILE_TIME_ASSERT( sizeof( LockInfo_t ) == sizeof( int64 ) ); Assert( (intp)this % 8 == 0 ); memset( (void *)this, 0, sizeof( *this ) ); }
|
||||
|
||||
bool TryLockForWrite();
|
||||
bool TryLockForRead();
|
||||
|
||||
@@ -139,8 +139,9 @@ void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
|
||||
{
|
||||
V_swap( m_pMemory, mem.m_pMemory );
|
||||
V_swap( m_nBlocks, mem.m_nBlocks );
|
||||
V_swap( m_nIndexMask, mem.m_nIndexMask );
|
||||
V_swap( m_nIndexShift, mem.m_nIndexShift );
|
||||
// Bit-fields cannot bind to non-const references; swap manually.
|
||||
int nIndexMask = m_nIndexMask; m_nIndexMask = mem.m_nIndexMask; mem.m_nIndexMask = nIndexMask;
|
||||
int nIndexShift = m_nIndexShift; m_nIndexShift = mem.m_nIndexShift; mem.m_nIndexShift = nIndexShift;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user