Commit 59505bbc authored by Markus Holzer's avatar Markus Holzer
Browse files

Remove merge header

parent d37fe5ae
Pipeline #38547 failed with stages
in 6 minutes and 11 seconds
......@@ -313,11 +313,7 @@ inline const T* IBlock::getData( const ConstBlockDataID & index ) const {
WALBERLA_ASSERT_LESS( uint_t( index ), data_.size() )
if( data_[index] == nullptr )
<<<<<<< HEAD
return NULL;
=======
return nullptr;
>>>>>>> 8dfa7d51f9600fc08d5edffa304fa538bd4f9c21
return data_[index]->template get< T >();
}
......@@ -340,11 +336,7 @@ inline const T* IBlock::getData( const BlockDataID & index ) const {
WALBERLA_ASSERT_LESS( uint_t( index ), data_.size() )
if( data_[index] == nullptr )
<<<<<<< HEAD
return NULL;
=======
return nullptr;
>>>>>>> 8dfa7d51f9600fc08d5edffa304fa538bd4f9c21
return data_[index]->template get< T >();
}
......@@ -454,11 +446,7 @@ inline void IBlock::addData( const BlockDataID & index, BlockData * const data )
data_.resize( index+1, nullptr );
if( data != nullptr ) {
<<<<<<< HEAD
WALBERLA_ASSERT_NULLPTR( data_[index] )
=======
WALBERLA_ASSERT_NULLPTR( data_[index] );
>>>>>>> 8dfa7d51f9600fc08d5edffa304fa538bd4f9c21
data_[index] = data;
}
}
......@@ -476,7 +464,7 @@ inline const T* IBlock::uncheckedFastGetData( const ConstBlockDataID & index ) c
WALBERLA_ASSERT_LESS( uint_t( index ), data_.size() )
if( data_[index] == nullptr )
return NULL;
return nullptr;
return data_[index]->template uncheckedFastGet< T >();
}
......@@ -496,11 +484,7 @@ inline const T* IBlock::uncheckedFastGetData( const BlockDataID & index ) const
WALBERLA_ASSERT_LESS( uint_t( index ), data_.size() )
if( data_[index] == nullptr )
<<<<<<< HEAD
return NULL;
=======
return nullptr;
>>>>>>> 8dfa7d51f9600fc08d5edffa304fa538bd4f9c21
return data_[index]->template uncheckedFastGet< T >();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment