From 420b5e592841cdb4321f4d18a7d5928c5afc1742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 24 Jul 2013 09:30:04 +0000 Subject: [PATCH] size_t fixes git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@868 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Tools/Utils/HeapT.hh | 6 +++--- src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh index 26365f20..f94b6800 100644 --- a/src/OpenMesh/Tools/Utils/HeapT.hh +++ b/src/OpenMesh/Tools/Utils/HeapT.hh @@ -291,11 +291,11 @@ private: /// Get parent's index - inline unsigned int parent(unsigned int _i) { return (_i-1)>>1; } + inline size_t parent(size_t _i) { return (_i-1)>>1; } /// Get left child's index - inline unsigned int left(unsigned int _i) { return (_i<<1)+1; } + inline size_t left(size_t _i) { return (_i<<1)+1; } /// Get right child's index - inline unsigned int right(unsigned int _i) { return (_i<<1)+2; } + inline size_t right(size_t _i) { return (_i<<1)+2; } }; diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh index 8125c1f1..7fc3e279 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh @@ -172,7 +172,7 @@ public: bool end() { return !(current_pos_ < window_max_-buffer_min_); } int window_size() const { return window_max_ - window_min_; } - int buffer_size() const { return buffer_max_ - buffer_min_; } + size_t buffer_size() const { return buffer_max_ - buffer_min_; } VHierarchyNodeHandle node_handle() {