Adjust according to build warnings/errors

This commit is contained in:
Jørgen Herje 2024-03-06 08:02:40 +01:00
parent 1bdc8e95a1
commit 548d74720e
4 changed files with 5 additions and 8 deletions

View File

@ -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 {};
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -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 = {};
}; };

View File

@ -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" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

View File

@ -55,8 +55,6 @@
#include "qfileinfo.h" #include "qfileinfo.h"
#include "qstring.h" #include "qstring.h"
#pragma optimize( "", off )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------