Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More size_t fixes

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@841 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-07-22 15:12:57 +00:00
parent ff5425d84f
commit fb38697831
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/Mesh/ArrayKernel.cc
View File

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

6
src/OpenMesh/Core/Mesh/ArrayKernel.hh
View File

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