diff --git a/src/OpenVolumeMesh/Core/GeometryKernel.hh b/src/OpenVolumeMesh/Core/GeometryKernel.hh index b11b1a216b7696018a34db6e33d69cffc1dcd0ff..00db13dac7776b7e284ff84aca7b6497ca678f12 100644 --- a/src/OpenVolumeMesh/Core/GeometryKernel.hh +++ b/src/OpenVolumeMesh/Core/GeometryKernel.hh @@ -80,12 +80,12 @@ public: assert(_vh.idx() < (int)vertices_.size()); - vertices_[_vh.idx()] = _p; + vertices_[_vh.uidx()] = _p; } /// Get point _vh's coordinates const VecT& vertex(const VertexHandle& _vh) const { - return vertices_[_vh.idx()]; + return vertices_[_vh.uidx()]; } VertexIter delete_vertex(const VertexHandle& _h) override { @@ -130,7 +130,7 @@ public: if (_h1 == _h2) return; - std::swap(vertices_[_h1.idx()], vertices_[_h2.idx()]); + std::swap(vertices_[_h1.uidx()], vertices_[_h2.uidx()]); TopologyKernelT::swap_vertex_indices(_h1, _h2); } diff --git a/src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh b/src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh index b16c8fd3ebf601ac90478f22c5243fb244cf367d..4f5af68368763e8bfbc2cfe0538f252e12dbee03 100644 --- a/src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh +++ b/src/OpenVolumeMesh/Core/OpenVolumeMeshProperty.hh @@ -109,7 +109,7 @@ public: data_[_dst_idx] = data_[_src_idx]; } void delete_element(size_t _idx) override { - data_.erase(data_.begin() + _idx); + data_.erase(data_.begin() + static_cast(_idx)); } public: diff --git a/src/OpenVolumeMesh/Core/PropertyPtr.hh b/src/OpenVolumeMesh/Core/PropertyPtr.hh index ad87998b61de5c3cd95c2d8cfad5d95dc7fa56b6..4d4e0560378beab9c396d7300c52b3b4ebcea3f0 100644 --- a/src/OpenVolumeMesh/Core/PropertyPtr.hh +++ b/src/OpenVolumeMesh/Core/PropertyPtr.hh @@ -103,7 +103,7 @@ public: const_reference operator[](size_t _idx) const { return (*ptr::shared_ptr::get())[_idx]; } #endif - reference operator[](const EntityHandleT& _h) { return (*ptr::shared_ptr::get())[_h.idx()]; } + reference operator[](const EntityHandleT& _h) { return (*ptr::shared_ptr::get())[_h.uidx()]; } const_reference operator[](const EntityHandleT& _h) const { return (*ptr::shared_ptr::get())[_h.uidx()]; } void serialize(std::ostream& _ostr) const override { ptr::shared_ptr::get()->serialize(_ostr); } diff --git a/src/OpenVolumeMesh/Geometry/Vector11T.hh b/src/OpenVolumeMesh/Geometry/Vector11T.hh index abf8d7ba1cf64e87d58c0f761a10c1b8570e4233..a6112904b9afcb5a35cdf345774f3361b20c10d1 100644 --- a/src/OpenVolumeMesh/Geometry/Vector11T.hh +++ b/src/OpenVolumeMesh/Geometry/Vector11T.hh @@ -678,7 +678,7 @@ auto operator<<(std::ostream& os, const VectorT &_vec) -> sizeof(decltype(os << _vec[0])) >= 0, std::ostream&>::type { os << _vec[0]; - for (int i = 1; i < DIM; ++i) { + for (size_t i = 1; i < DIM; ++i) { os << " " << _vec[i]; } return os; @@ -689,7 +689,7 @@ template auto operator>> (std::istream& is, VectorT &_vec) -> typename std::enable_if< sizeof(decltype(is >> _vec[0])) >= 0, std::istream &>::type { - for (int i = 0; i < DIM; ++i) + for (size_t i = 0; i < DIM; ++i) is >> _vec[i]; return is; }