From fb3869783183c025a69139070a42022c2fe7bf6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 22 Jul 2013 15:12:57 +0000
Subject: [PATCH] More size_t fixes

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@841 fdac6126-5c0c-442c-9429-916003d36597
---
 Doc/changelog.docu                    | 15 ++++++++++++++-
 src/OpenMesh/Core/Mesh/ArrayKernel.cc |  4 ++--
 src/OpenMesh/Core/Mesh/ArrayKernel.hh |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index e94a480c..91ea98a3 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -8,7 +8,12 @@
 <!-- --------------------------------------------------------------------- -->
 
 
-<tr valign=top><td><b>2.4</b> (?/?/?,Rev.830)</td><td>
+<tr valign=top><td><b>2.4</b> (?/?/?,Rev.838)</td><td>
+
+<b>Significant interface changes</b>
+<ul>
+<li><b>The functions n_vertices(),n_edges().n_faces() return size_t now.</b></li>
+</ul>
 
 <b>Vector Type</b>
 <ul>
@@ -16,6 +21,13 @@
 <li>minimize and maximize return vector_type& (reference) instead of vector_type (value) to allow chaining p.minimize(p1).minimize(p2). (Thanks to Vladimir Chalupecky for the hint)</li>
 </ul>
 
+<b>Core</b>
+<ul>
+<li>Allow PolyConnectivity::delete_edge to mark an edge as deleted, if there are no faces incident.</li>
+<li>Don't use c headers in c++ files anymore</li>
+</ul>
+
+
 <b>IO</b>
 <ul>
 <li>Try to get rid of memory leak in IOManager(Changes the pointer used for IOManager to a static IOManager in the getter function)</li>
@@ -57,6 +69,7 @@
 
 <b>Unittests</b>
 <ul>
+<li>Added unittest for skipping iterators</li>
 <li>Added unittest for collapse and is_collapse_ok</li>
 <li>Added unittests for delete_face</li>
 <li>Added unittests for circulators</li>
diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
index 86991944..e6bb2ca5 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.cc
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
@@ -144,7 +144,7 @@ void ArrayKernel::clear()
 
 
 
-void ArrayKernel::resize( unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces )
+void ArrayKernel::resize( size_t _n_vertices, size_t _n_edges, size_t _n_faces )
 {
   vertices_.resize(_n_vertices);
   edges_.resize(_n_edges);
@@ -156,7 +156,7 @@ void ArrayKernel::resize( unsigned int _n_vertices, unsigned int _n_edges, unsig
   fprops_resize(n_faces());
 }
 
-void ArrayKernel::reserve(unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces )
+void ArrayKernel::reserve(size_t _n_vertices, size_t _n_edges, size_t _n_faces )
 {
   vertices_.reserve(_n_vertices);
   edges_.reserve(_n_edges);
diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
index 946545bb..c705a84b 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
@@ -257,8 +257,8 @@ public:
 
 public:
   // --- resize/reserve ---
-  void resize( unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces );
-  void reserve(unsigned int _n_vertices, unsigned int _n_edges, unsigned int _n_faces );
+  void resize( size_t _n_vertices, size_t _n_edges, size_t _n_faces );
+  void reserve(size_t _n_vertices, size_t _n_edges, size_t _n_faces );
 
   // --- deletion ---
   /** \brief garbage collection
@@ -685,7 +685,7 @@ public:
     typedef typename HandleContainer::const_iterator
                                             const_iterator;
   public:
-    ExtStatusSetT(ArrayKernel& _kernel, unsigned int _capacity_hint = 0)
+    ExtStatusSetT(ArrayKernel& _kernel, size_t _capacity_hint = 0)
     : Base(_kernel)
     { handles_.reserve(_capacity_hint); }