Commit 5149aba8 authored by Max Lyon's avatar Max Lyon

Merge branch 'master' into smart_range_improvement

parents 9c806888 113f2879
......@@ -32,7 +32,7 @@ echo "CPPCHECK Summary"
echo "=============================================================================="
echo -e "${NC}"
MAX_COUNT=27
MAX_COUNT=23
if [ $COUNT -gt $MAX_COUNT ]; then
echo -e ${WARNING}
......
......@@ -766,7 +766,7 @@ public:
//! Complexity: O(1)
inline void erase(iterator _it)
{
assert(_it != end() && is_in(*_it));
assert(_it != const_cast<const ExtStatusSetT*>(this)->end() && is_in(*_it));
Base::erase(*_it);
*_it = handles_.back();
_it.pop_back();
......
......@@ -315,8 +315,6 @@ class GenericCirculatorT : protected GenericCirculatorBaseT<typename GenericCirc
/// Standard dereferencing operator.
smart_value_type operator*() const {
// We can't use this due to a GCC6 compiler bug
const GenericCirculatorBaseT<Mesh>* self = this;
#ifndef NDEBUG
assert(this->heh_.is_valid());
value_type res = GenericCirculatorT_TraitsT::toHandle(this->mesh_, this->heh_);
......@@ -504,8 +502,6 @@ class GenericCirculatorT_DEPRECATED : protected GenericCirculatorBaseT<typename
/// Standard dereferencing operator.
smart_value_type operator*() const {
// We can't use this due to a GCC6 compiler bug
const GenericCirculatorBaseT<Mesh>* self = this;
#ifndef NDEBUG
assert(this->heh_.is_valid());
value_type res = (GenericCirculatorT_DEPRECATED_TraitsT::toHandle(this->mesh_, this->heh_));
......
......@@ -133,16 +133,16 @@ template<class MeshT>
float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) {
typename Mesh::VertexHandle v2, v3;
typename Mesh::FaceHandle fh;
const typename Mesh::Point *p1(&_ci.p1), *p2, *p3;
const typename Mesh::Point* p1(&_ci.p1);
typename Mesh::Scalar r0, r1, r0_min(1.0), r1_min(1.0);
typename Mesh::ConstVertexOHalfedgeIter voh_it(mesh_, _ci.v0);
v3 = mesh_.to_vertex_handle(*voh_it);
p3 = &mesh_.point(v3);
auto p3 = &mesh_.point(v3);
while (voh_it.is_valid()) {
v2 = v3;
p2 = p3;
auto p2 = p3;
++voh_it;
v3 = mesh_.to_vertex_handle(*voh_it);
......
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