diff --git a/Fwk/AppFwk/CommonCode/cafVecIjk.cpp b/Fwk/AppFwk/CommonCode/cafVecIjk.cpp index 16d60de3b4..38c39cfc61 100644 --- a/Fwk/AppFwk/CommonCode/cafVecIjk.cpp +++ b/Fwk/AppFwk/CommonCode/cafVecIjk.cpp @@ -43,7 +43,7 @@ namespace caf { //-------------------------------------------------------------------------------------------------- VecIjk::VecIjk(size_t i, size_t j, size_t k) { - m_values = { i, j, k }; + m_values = { {i, j, k} }; } //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp index 708e3ad558..7e82ed2c93 100644 --- a/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp +++ b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp @@ -198,6 +198,8 @@ void StructGridInterface::neighborIJKAtCellFace(size_t i, size_t j, size_t k, Fa case NEG_J : if (j > 0) (*nj)--; else (*nj) = cvf::UNDEFINED_SIZE_T; break; case POS_K : (*nk)++; break; case NEG_K : if (k > 0) (*nk)--; else (*nk) = cvf::UNDEFINED_SIZE_T; break; + default: + break; } } diff --git a/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp b/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp index f6ec78936c..8763812d2f 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp @@ -134,7 +134,9 @@ bool HexGridIntersectionTools::planeTriangleIntersection(const cvf::Plane& plane CVF_ASSERT(false); } - bool ok1, ok2; + bool ok1 = false; + bool ok2 = false; + if (topVx == 1) { ok1 = planeLineIntersect(plane, p1, p2, &((*newVx1).vx), &((*newVx1).normDistFromEdgeVx1));