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 linux compile error and warnings

Browse Source
This commit is contained in:
Jacob Støren 2020-02-25 17:05:49 +01:00
parent 6d07e7a8ff
commit afea6963b2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
View File

@ -182,7 +182,7 @@ void RivSurfaceIntersectionGeometryGenerator::calculateArrays()
// End loop local memory // End loop local memory
#pragma omp for // default scheduling absolutely best #pragma omp for // default scheduling absolutely best
for ( int ntVxIdx = 0; ntVxIdx < nativeTriangleIndices.size(); ntVxIdx += 3 ) for ( int ntVxIdx = 0; ntVxIdx < static_cast<int>( nativeTriangleIndices.size() ); ntVxIdx += 3 )
{ {
cvf::Vec3d p0 = nativeVertices[nativeTriangleIndices[ntVxIdx + 0]]; cvf::Vec3d p0 = nativeVertices[nativeTriangleIndices[ntVxIdx + 0]];
cvf::Vec3d p1 = nativeVertices[nativeTriangleIndices[ntVxIdx + 1]]; cvf::Vec3d p1 = nativeVertices[nativeTriangleIndices[ntVxIdx + 1]];

2
ApplicationCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
View File

@ -450,7 +450,7 @@ void RivSurfacePartMgr::calculateVertexTextureCoordinates( cvf::Vec2fArray*
{ {
if ( !resultAccessor ) return; if ( !resultAccessor ) return;
size_t numVertices = vertexToCellIdxMap.size(); int numVertices = static_cast<int>( vertexToCellIdxMap.size() );
textureCoords->resize( numVertices ); textureCoords->resize( numVertices );
cvf::Vec2f* rawPtr = textureCoords->ptr(); cvf::Vec2f* rawPtr = textureCoords->ptr();

2
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -707,7 +707,7 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
for ( time_t tt : selectedTimesteps ) for ( time_t tt : selectedTimesteps )
{ {
for ( int timestepIdx = 0; timestepIdx < timesteps.size(); ++timestepIdx ) for ( int timestepIdx = 0; static_cast<unsigned>( timestepIdx ) < timesteps.size(); ++timestepIdx )
{ {
if ( timesteps[timestepIdx] == tt ) if ( timesteps[timestepIdx] == tt )
{ {

2
ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
View File

@ -138,7 +138,7 @@ public:
} }
else else
{ {
return "X"; // Just for debugging return QwtText( QString( "X" ) ); // Just for debugging
} }
} }