OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeckItemT::SIdata mutable modifier

Browse Source 
Replaces const_cast in favour of mutable keyword in order to avoid
undefined behaviour under some conditions.
This commit is contained in:
Jørgen Kvalsvik
2016-04-03 01:00:35 +02:00
parent 135f405e93
commit f8bab0e703
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/parser/eclipse/Deck/DeckItem.cpp
View File

@@ -76,7 +76,7 @@ namespace Opm {
const std::vector< double >& assertSIData() const;
std::unique_ptr< DeckItemBase > clone() const override;
std::vector< double > SIdata;
mutable std::vector< double > SIdata;
std::vector< std::shared_ptr< const Dimension > > dimensions;
friend class DeckItem;
@@ -222,16 +222,15 @@ namespace Opm {
* This is an unobservable state change - SIData is lazily converted to
* SI units, so externally the object still behaves as const
*/
auto& data = const_cast< DeckItemT< double >* >( this )->SIdata;
data.resize( this->size() );
this->SIdata.resize( this->size() );
for( size_t index = 0; index < this->size(); index++ ) {
const auto dimIndex = ( index % dimensions.size() );
data[ index ] = this->dimensions[ dimIndex ]
this->SIdata[ index ] = this->dimensions[ dimIndex ]
->convertRawToSi( this->get( index ) );
}
return data;
return this->SIdata;
}
template< typename T >