Fixed more clang warnings

This commit is contained in:
Jan Möbius
2019-05-29 10:55:52 +02:00
parent 417a460645
commit 7c1a8012d5
11 changed files with 19 additions and 20 deletions

View File

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

View File

@@ -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)

View File

@@ -122,7 +122,7 @@ protected: // inherited interface
}
#ifdef NDEBUG
bool cleanup( MeshType& )
bool cleanup( MeshType& ) override
#else
bool cleanup( MeshType& _m ) override
#endif

View File

@@ -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;
/*
// *---------*---------*