From 2fcc35446124f74a82e3232f6ba6fdba42773ae7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 29 Apr 2018 13:28:36 +0200 Subject: [PATCH] fix several warnings: -Winconsistent-missing-override -Wsign-compare -Wmaybe-uninitialized -Wmissing-braces --- .../MeshPart/App/MeshFlatteningLscmRelax.cpp | 28 +++++++++---------- src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp | 4 ++- src/Mod/PartDesign/App/DatumPoint.h | 4 +-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp index 6536608f5c..f629c82d0f 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp @@ -77,7 +77,7 @@ unsigned int get_max_distance(Vector3 point, RowMat vertices, double { max_dist = 0; double dist; - unsigned long max_dist_index; + unsigned long max_dist_index = 0; long j = 0; for (j=0; j < vertices.cols(); j++) { @@ -325,7 +325,7 @@ void LscmRelax::area_relax(double weight) fabs(this->q_l_m(i, 0) * this->q_l_m(i, 2)); rhs_lsq[i] = delta_a * 0.1; - std::array range_6 {0, 1, 2, 3, 4, 5}; + std::array range_6 {{0, 1, 2, 3, 4, 5}}; std::array indices; for (int index=0; index<3; index++) { @@ -356,17 +356,17 @@ void LscmRelax::edge_relax(double weight) std::array edge; for(long i=0; itriangles.cols(); i++) { - for(int j=0; j<3; j++) - { - long k = j+1; - if (k==3) - k = 0; - if (this->triangles(j, i) < this->triangles(k, i)) - edge = std::array{this->triangles(j, i), this->triangles(k, i)}; - else - edge = std::array{this->triangles(k, i), this->triangles(j, i)}; - edges.insert(edge); - } + for(int j=0; j<3; j++) + { + long k = j+1; + if (k==3) + k = 0; + if (this->triangles(j, i) < this->triangles(k, i)) + edge = std::array{{this->triangles(j, i), this->triangles(k, i)}}; + else + edge = std::array{{this->triangles(k, i), this->triangles(j, i)}}; + edges.insert(edge); + } } // 2. create system @@ -455,7 +455,7 @@ void LscmRelax::lscm() std::vector mat_triplets; for (auto triplet: triple_list) { - if (triplet.col() > (this->vertices.cols() - this->fixed_pins.size()) * 2 - 1) + if (triplet.col() > static_cast((this->vertices.cols() - this->fixed_pins.size()) * 2 - 1)) rhs_triplets.push_back(triplet); else mat_triplets.push_back(triplet); diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp index bc7fa286e9..bf391c0430 100644 --- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp +++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp @@ -68,6 +68,7 @@ std::function get_basis(int degree, int i, Eigen::VectorXd knots return [degree, i, knots](double t) { // The basis function for degree = 0 as per eq. 7 + (void)degree; double t_this = knots[i]; double t_next = knots[i+1]; if (t == knots[0]) @@ -100,7 +101,7 @@ std::function get_basis(int degree, int i, Eigen::VectorXd knots return out; }; } -}; +} std::function get_basis_derivative(int order, int degree, int i, Eigen::VectorXd knots) @@ -114,6 +115,7 @@ std::function get_basis_derivative(int order, int degree, int i, { return [degree, i, knots, order](double t) { + (void)order; double out = 0; if (!(knots[i + degree] - knots[i] == 0)) { diff --git a/src/Mod/PartDesign/App/DatumPoint.h b/src/Mod/PartDesign/App/DatumPoint.h index bddea116e7..b3dde780b4 100644 --- a/src/Mod/PartDesign/App/DatumPoint.h +++ b/src/Mod/PartDesign/App/DatumPoint.h @@ -40,7 +40,7 @@ public: Point(); virtual ~Point(); - const char* getViewProviderName(void) const { + const char* getViewProviderName(void) const override { return "PartDesignGui::ViewProviderDatumPoint"; } @@ -49,7 +49,7 @@ public: typedef Part::Datum Superclass; protected: - virtual void onChanged(const App::Property* prop); + virtual void onChanged(const App::Property* prop) override; virtual void onDocumentRestored() override; private: