mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Adjust according to build warnings/errors
This commit is contained in:
parent
1bdc8e95a1
commit
548d74720e
@ -28,8 +28,6 @@
|
|||||||
#include "cvfPlane.h"
|
#include "cvfPlane.h"
|
||||||
#include "cvfVertexWelder.h"
|
#include "cvfVertexWelder.h"
|
||||||
|
|
||||||
#pragma optimize( "", off )
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -81,10 +79,10 @@ const cvf::Vec3fArray* RivPolylineIntersectionGeometryGenerator::triangleVxes()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
const std::vector<RivIntersectionVertexWeights>& RivPolylineIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
|
const std::vector<RivIntersectionVertexWeights>& RivPolylineIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
|
||||||
{
|
{
|
||||||
|
// Not implemented - not in use
|
||||||
CVF_ASSERT( false );
|
CVF_ASSERT( false );
|
||||||
|
|
||||||
// Not implemented error
|
return m_emptyTriVxToCellCornerWeights;
|
||||||
return {};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -82,4 +82,7 @@ private:
|
|||||||
std::vector<size_t> m_polygonToCellIdxMap;
|
std::vector<size_t> m_polygonToCellIdxMap;
|
||||||
cvf::ref<cvf::Vec3fArray> m_polygonVertices;
|
cvf::ref<cvf::Vec3fArray> m_polygonVertices;
|
||||||
std::vector<size_t> m_verticesPerPolygon;
|
std::vector<size_t> m_verticesPerPolygon;
|
||||||
|
|
||||||
|
// Dummy vectors for GeomGen Interface
|
||||||
|
const std::vector<RivIntersectionVertexWeights> m_emptyTriVxToCellCornerWeights = {};
|
||||||
};
|
};
|
||||||
|
@ -128,8 +128,6 @@
|
|||||||
|
|
||||||
#include <climits>
|
#include <climits>
|
||||||
|
|
||||||
#pragma optimize( "", off )
|
|
||||||
|
|
||||||
CAF_PDM_XML_SOURCE_INIT( RimEclipseView, "ReservoirView" );
|
CAF_PDM_XML_SOURCE_INIT( RimEclipseView, "ReservoirView" );
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
|
@ -55,8 +55,6 @@
|
|||||||
#include "qfileinfo.h"
|
#include "qfileinfo.h"
|
||||||
#include "qstring.h"
|
#include "qstring.h"
|
||||||
|
|
||||||
#pragma optimize( "", off )
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user