mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Compile error fix for gcc on ubuntu 16.04
This commit is contained in:
parent
0944aa5771
commit
1a1706d2fa
@ -23,6 +23,8 @@
|
|||||||
|
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
@ -242,14 +244,14 @@ bool RimSurface::updateSurfaceDataFromFile()
|
|||||||
unsigned q3 = indexToPointData[iIdx + 1][jIdx + 0];
|
unsigned q3 = indexToPointData[iIdx + 1][jIdx + 0];
|
||||||
unsigned q4 = indexToPointData[iIdx + 1][jIdx + 1];
|
unsigned q4 = indexToPointData[iIdx + 1][jIdx + 1];
|
||||||
|
|
||||||
if ( q1 != -1 && q2 != -1 && q4 != -1 )
|
if ( q1 != ( (unsigned)-1 ) && q2 != ( (unsigned)-1 ) && q4 != ( (unsigned)-1 ) )
|
||||||
{
|
{
|
||||||
triangleIndices.push_back( q1 );
|
triangleIndices.push_back( q1 );
|
||||||
triangleIndices.push_back( q2 );
|
triangleIndices.push_back( q2 );
|
||||||
triangleIndices.push_back( q4 );
|
triangleIndices.push_back( q4 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( q1 != -1 && q2 != -1 && q3 != -1 )
|
if ( q1 != ( (unsigned)-1 ) && q2 != ( (unsigned)-1 ) && q3 != ( (unsigned)-1 ) )
|
||||||
{
|
{
|
||||||
triangleIndices.push_back( q1 );
|
triangleIndices.push_back( q1 );
|
||||||
triangleIndices.push_back( q4 );
|
triangleIndices.push_back( q4 );
|
||||||
|
Loading…
Reference in New Issue
Block a user