OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix type conversion error

Browse Source 
Weird conversion error seen for Unity build on MSVC. Single file compile works fine.
This commit is contained in:
Magne Sjaastad 2023-03-24 18:32:16 +01:00 committed by GitHub
parent ab0b958884
commit 173a66a409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h
View File

@ -47,11 +47,11 @@ public:
RimSummaryTable(); RimSummaryTable();
~RimSummaryTable() override; ~RimSummaryTable() override;
void setDefaultCaseAndCategoryAndVectorName(); void setDefaultCaseAndCategoryAndVectorName();
void setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase, void setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddress::SummaryVarCategory category, RifEclipseSummaryAddress::SummaryVarCategory category,
const QString& vectorName ); const QString& vectorName );
void setDescription( const QString& description ); void setDescription( const QString& description );
QString description() const override; QString description() const override;
private: private:

2
ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
View File

@ -448,6 +448,6 @@ void RiuMatrixPlotWidget::onPlotItemSelected( std::shared_ptr<RiuPlotItem> plotI
MatrixShapeItem* matrixItem = dynamic_cast<MatrixShapeItem*>( qwtPlotItem->qwtPlotItem() ); MatrixShapeItem* matrixItem = dynamic_cast<MatrixShapeItem*>( qwtPlotItem->qwtPlotItem() );
if ( matrixItem ) if ( matrixItem )
{ {
matrixCellSelected.send( std::make_pair( matrixItem->rowIndex, matrixItem->columnIndex ) ); matrixCellSelected.send( std::make_pair( static_cast<int>( matrixItem->rowIndex ), static_cast<int>( matrixItem->columnIndex ) ) );
} }
} }