Commit 7c1a8012 authored by Jan Möbius's avatar Jan Möbius

Fixed more clang warnings

parent 417a4606
Pipeline #10649 failed with stage
in 19 minutes and 18 seconds
......@@ -30,7 +30,7 @@ echo "CPPCHECK Summary"
echo "=============================================================================="
echo -e "${NC}"
MAX_COUNT=27
MAX_COUNT=26
if [ $COUNT -gt $MAX_COUNT ]; then
echo -e ${WARNING}
......
......@@ -363,7 +363,7 @@ public:
}
/// Make a copy of self.
PropertyT<bool>* clone() const
PropertyT<bool>* clone() const override
{
PropertyT<bool>* p = new PropertyT<bool>( *this );
return p;
......@@ -451,7 +451,7 @@ public:
return ((value_type*) &data_[0])[_idx];
}
PropertyT<value_type>* clone() const {
PropertyT<value_type>* clone() const override {
PropertyT<value_type>* p = new PropertyT<value_type>( *this );
return p;
}
......
......@@ -123,7 +123,7 @@ class ModHausdorffT: public ModBaseT<MeshT> {
virtual float collapse_priority(const CollapseInfo& _ci);
/// re-distribute points
virtual void postprocess_collapse(const CollapseInfo& _ci);
virtual void postprocess_collapse(const CollapseInfo& _ci) override;
/// set the percentage of tolerance
void set_error_tolerance_factor(double _factor);
......
......@@ -77,7 +77,7 @@ class ModIndependentSetsT: public ModBaseT<MeshT> {
}
/// override
void postprocess_collapse(const CollapseInfo& _ci) {
void postprocess_collapse(const CollapseInfo& _ci) override {
typename Mesh::VertexVertexIter vv_it;
Base::mesh().status(_ci.v1).set_locked(true);
......
......@@ -216,7 +216,7 @@ public:
}
void postprocess_collapse(const CollapseInfo& _ci) {
void postprocess_collapse(const CollapseInfo& _ci) override {
// account for changed normals
typename Mesh::VertexFaceIter vf_it(mesh_, _ci.v1);
for (; vf_it.is_valid(); ++vf_it)
......
......@@ -130,7 +130,7 @@ public: // inherited
/// Stores collapse information in a queue.
/// \see infolist()
void postprocess_collapse(const CollapseInfo& _ci)
void postprocess_collapse(const CollapseInfo& _ci) override
{
pmi_.push_back( Info( _ci ) );
}
......
......@@ -131,7 +131,7 @@ public: // inherited
/// Post-process halfedge collapse (accumulate quadrics)
virtual void postprocess_collapse(const CollapseInfo& _ci)
virtual void postprocess_collapse(const CollapseInfo& _ci) override
{
Base::mesh().property(quadrics_, _ci.v1) +=
Base::mesh().property(quadrics_, _ci.v0);
......
......@@ -101,8 +101,8 @@ public:
explicit Tvv3(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(3); };
void raise(typename M::FaceHandle& _fh, state_t _target_state);
void raise(typename M::VertexHandle& _vh, state_t _target_state);
void raise(typename M::FaceHandle& _fh, state_t _target_state) override;
void raise(typename M::VertexHandle& _vh, state_t _target_state) override;
MIPS_WARN_WA(Edge) // avoid warning
};
......@@ -126,9 +126,9 @@ public:
explicit Tvv4(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(4); };
void raise(typename M::FaceHandle& _fh, state_t _target_state);
void raise(typename M::VertexHandle& _vh, state_t _target_state);
void raise(typename M::EdgeHandle& _eh, state_t _target_state);
void raise(typename M::FaceHandle& _fh, state_t _target_state) override;
void raise(typename M::VertexHandle& _vh, state_t _target_state) override;
void raise(typename M::EdgeHandle& _eh, state_t _target_state) override;
private:
......@@ -154,7 +154,7 @@ public:
explicit VF(M& _mesh) : Inherited(_mesh) {}
void raise(typename M::FaceHandle& _fh, state_t _target_state);
void raise(typename M::FaceHandle& _fh, state_t _target_state) override;
MIPS_WARN_WA(Edge)
MIPS_WARN_WA(Vertex)
};
......@@ -176,7 +176,7 @@ public:
explicit FF(M& _mesh) : Inherited(_mesh) {}
void raise(typename M::FaceHandle& _fh, state_t _target_state);
void raise(typename M::FaceHandle& _fh, state_t _target_state) override;
MIPS_WARN_WA(Vertex) // avoid warning
MIPS_WARN_WA(Edge ) // avoid warning
};
......@@ -198,7 +198,7 @@ public:
explicit FFc(M& _mesh) : Inherited(_mesh) {}
void raise(typename M::FaceHandle& _fh, state_t _target_state);
void raise(typename M::FaceHandle& _fh, state_t _target_state) override;
MIPS_WARN_WA(Vertex) // avoid warning
MIPS_WARN_WA(Edge ) // avoid warning
};
......@@ -220,7 +220,7 @@ public:
explicit FV(M& _mesh) : Inherited(_mesh) {}
void raise(typename M::VertexHandle& _vh, state_t _target_state);
void raise(typename M::VertexHandle& _vh, state_t _target_state) override;
MIPS_WARN_WA(Face) // avoid warning
MIPS_WARN_WA(Edge) // avoid warning
};
......
......@@ -333,7 +333,6 @@ CatmullClarkT<MeshType,RealType>::update_vertex( MeshType& _m, const VertexHandl
// and http://www.cs.utah.edu/~lacewell/subdeval
if ( _m.is_boundary( _vh))
{
Normal Vec;
pos = _m.point(_vh);
VertexEdgeIter ve_itr;
for ( ve_itr = _m.ve_iter( _vh); ve_itr.is_valid(); ++ve_itr)
......
......@@ -122,7 +122,7 @@ protected: // inherited interface
}
#ifdef NDEBUG
bool cleanup( MeshType& )
bool cleanup( MeshType& ) override
#else
bool cleanup( MeshType& _m ) override
#endif
......
......@@ -409,7 +409,7 @@ private:
typename MeshType::HalfedgeHandle heh;
typename MeshType::VertexHandle vh1, vh2, vh3, vh4, vhl, vhr;
typename MeshType::Point zero(0,0,0), P1, P2, P3, P4;
typename MeshType::Point P1, P2, P3, P4;
/*
// *---------*---------*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment