Commit c657f9a1 authored by Matthias Möller's avatar Matthias Möller

- fix some cpp check warnings and errors

- fix "property_copy" which has no selfassign now

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@836 fdac6126-5c0c-442c-9429-916003d36597
parent 1f1cffcd
......@@ -327,7 +327,7 @@ QGLViewerWidget::mouseMoveEvent( QMouseEvent* _event )
{
if (last_point_ok_)
{
if (newPoint_hitSphere = map_to_sphere(newPoint2D, newPoint3D))
if ((newPoint_hitSphere = map_to_sphere(newPoint2D, newPoint3D)))
{
Vec3f axis = last_point_3D_ % newPoint3D;
float cos_angle = (last_point_3D_ | newPoint3D);
......
......@@ -719,7 +719,7 @@ public:
assert(_it != end() && is_in(*_it));
clear(*_it);
*_it = handles_.back();
*_it.pop_back();
_it.pop_back();
}
inline void clear()
......
......@@ -415,7 +415,7 @@ public: //------------------------------------------------ copy property
template <class T>
void copy_property(VPropHandleT<T>& _ph, VertexHandle _vh_from, VertexHandle _vh_to) {
if(_vh_from.is_valid() && _vh_to.is_valid())
vprops_.property(_ph)[_vh_from.idx()] = vprops_.property(_ph)[_vh_from.idx()];
vprops_.property(_ph)[_vh_to.idx()] = vprops_.property(_ph)[_vh_from.idx()];
}
/** Copies a single property from one mesh element to another (of the same type)
......@@ -427,7 +427,7 @@ public: //------------------------------------------------ copy property
template <class T>
void copy_property(HPropHandleT<T> _ph, HalfedgeHandle _hh_from, HalfedgeHandle _hh_to) {
if(_hh_from.is_valid() && _hh_to.is_valid())
hprops_.property(_ph)[_hh_from.idx()] = hprops_.property(_ph)[_hh_from.idx()];
hprops_.property(_ph)[_hh_to.idx()] = hprops_.property(_ph)[_hh_from.idx()];
}
/** Copies a single property from one mesh element to another (of the same type)
......@@ -439,7 +439,7 @@ public: //------------------------------------------------ copy property
template <class T>
void copy_property(EPropHandleT<T> _ph, EdgeHandle _eh_from, EdgeHandle _eh_to) {
if(_eh_from.is_valid() && _eh_to.is_valid())
eprops_.property(_ph)[_eh_from.idx()] = eprops_.property(_ph)[_eh_from.idx()];
eprops_.property(_ph)[_eh_to.idx()] = eprops_.property(_ph)[_eh_from.idx()];
}
/** Copies a single property from one mesh element to another (of the same type)
......@@ -451,7 +451,7 @@ public: //------------------------------------------------ copy property
template <class T>
void copy_property(FPropHandleT<T> _ph, FaceHandle _fh_from, FaceHandle _fh_to) {
if(_fh_from.is_valid() && _fh_to.is_valid())
fprops_.property(_ph)[_fh_from.idx()] = fprops_.property(_ph)[_fh_from.idx()];
fprops_.property(_ph)[_fh_to.idx()] = fprops_.property(_ph)[_fh_from.idx()];
}
......
......@@ -238,14 +238,14 @@ class VertexVertexIterT
/// Return the handle of the current target.
typename Mesh::VertexHandle handle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);;
return mesh_->to_vertex_handle(heh_);
}
/// Cast to the handle of the current target.
operator typename Mesh::VertexHandle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);;
return mesh_->to_vertex_handle(heh_);
}
......@@ -432,14 +432,14 @@ class ConstVertexVertexIterT
/// Return the handle of the current target.
typename Mesh::VertexHandle handle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);;
return mesh_->to_vertex_handle(heh_);
}
/// Cast to the handle of the current target.
operator typename Mesh::VertexHandle() const {
assert(mesh_);
return mesh_->to_vertex_handle(heh_);;
return mesh_->to_vertex_handle(heh_);
}
......
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