From 62ef24047adf537ead806f23bff1fa3efa319fe5 Mon Sep 17 00:00:00 2001
From: Hans-Christian Ebke <ebke@cs.rwth-aachen.de>
Date: Thu, 1 Mar 2012 17:06:44 +0000
Subject: [PATCH] Fixed subtle issue with new consolidated iterator that
 slightly altered it behavior.

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@549 fdac6126-5c0c-442c-9429-916003d36597
---
 src/OpenMesh/Core/Mesh/IteratorsT.hh       | 4 ++--
 src/OpenMesh/Core/Mesh/PolyConnectivity.hh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OpenMesh/Core/Mesh/IteratorsT.hh b/src/OpenMesh/Core/Mesh/IteratorsT.hh
index 3eb1f512..d083536b 100644
--- a/src/OpenMesh/Core/Mesh/IteratorsT.hh
+++ b/src/OpenMesh/Core/Mesh/IteratorsT.hh
@@ -77,7 +77,7 @@ template <class Mesh> class ConstFaceIterT;
 template <class Mesh> class FaceIterT;
 
 
-template <class Mesh, class ValueHandle>
+template <class Mesh, class ValueHandle, class PrimitiveStatusFnOwner, bool (PrimitiveStatusFnOwner::*PrimitiveStatusFn)() const>
 class GenericIteratorT {
     public:
         //--- Typedefs ---
@@ -154,7 +154,7 @@ class GenericIteratorT {
 
         /// Turn on skipping: automatically skip deleted/hidden elements
         void enable_skipping() {
-            if (mesh_ && mesh_->has_vertex_status()) {
+            if (mesh_ && (mesh_->*PrimitiveStatusFn)()) {
                 Attributes::StatusInfo status;
                 status.set_deleted(true);
                 status.set_hidden(true);
diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh
index 63d55711..fdfe9670 100644
--- a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh
+++ b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh
@@ -76,10 +76,10 @@ public:
   */
   //@{
   /// Linear iterator
-  typedef Iterators::GenericIteratorT<This, This::VertexHandle> VertexIter;
-  typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle> HalfedgeIter;
-  typedef Iterators::GenericIteratorT<This, This::EdgeHandle> EdgeIter;
-  typedef Iterators::GenericIteratorT<This, This::FaceHandle> FaceIter;
+  typedef Iterators::GenericIteratorT<This, This::VertexHandle, ArrayKernel, &This::has_vertex_status> VertexIter;
+  typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle, ArrayKernel, &This::has_halfedge_status> HalfedgeIter;
+  typedef Iterators::GenericIteratorT<This, This::EdgeHandle, ArrayKernel, &This::has_edge_status> EdgeIter;
+  typedef Iterators::GenericIteratorT<This, This::FaceHandle, ArrayKernel, &This::has_face_status> FaceIter;
 
   typedef VertexIter ConstVertexIter;
   typedef HalfedgeIter ConstHalfedgeIter;