remove #if __cplusplus checks
This commit is contained in:
parent
9918bbd0cb
commit
3abfb61aca
|
@ -103,16 +103,12 @@ void JoltPhysicsFluidController::OnJoltPhysicsObjectDestroyed( JoltPhysicsObject
|
|||
if ( pObject == m_pFluidObject )
|
||||
m_pFluidObject = nullptr;
|
||||
|
||||
#if __cplusplus >= 202002L
|
||||
std::erase_if( m_ObjectsInShape, [pObject]( JoltPhysicsObject *pCachedObject ) { return pObject == pCachedObject; } );
|
||||
#else
|
||||
for ( auto it( m_ObjectsInShape.begin() ); it != m_ObjectsInShape.end(); ++it ) {
|
||||
if ( *it == pObject ) {
|
||||
m_ObjectsInShape.erase(it);
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -54,12 +54,8 @@ void JoltPhysicsObjectPairHash::RemoveObjectPair( void *pObject0, void *pObject1
|
|||
bool JoltPhysicsObjectPairHash::IsObjectPairInHash( void *pObject0, void *pObject1 )
|
||||
{
|
||||
auto pair = CreateSortedPair( pObject0, pObject1 );
|
||||
auto &pairHashes = m_PairHashes[ GetHashArrayIndex( PointerHasher{}( pair ) ) ];
|
||||
#if __cplusplus >= 202002L
|
||||
return pairHashes.contains( pair );
|
||||
#else
|
||||
auto &pairHashes = m_PairHashes[ GetHashArrayIndex( PointerHasher{}( pair ) ) ];
|
||||
return pairHashes.find( pair ) != pairHashes.end();
|
||||
#endif
|
||||
}
|
||||
|
||||
void JoltPhysicsObjectPairHash::RemoveAllPairsForObject( void *pObject0 )
|
||||
|
@ -76,11 +72,7 @@ void JoltPhysicsObjectPairHash::RemoveAllPairsForObject( void *pObject0 )
|
|||
|
||||
bool JoltPhysicsObjectPairHash::IsObjectInHash( void *pObject0 )
|
||||
{
|
||||
#if __cplusplus >= 202002L
|
||||
return m_Objects.contains( pObject0 );
|
||||
#else
|
||||
return m_Objects.find( pObject0 ) != m_Objects.end();
|
||||
#endif
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue