From b6935c2b7524e118c4540627a6ccd797f97f4950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 25 Jun 2014 10:50:14 +0000 Subject: [PATCH] Fixed remaining bad ifdefs git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@279 66977474-1d4b-4f09-8fe9-267525286df2 --- src/OpenVolumeMesh/Core/OpenVolumeMeshHandle.hh | 4 ++-- src/OpenVolumeMesh/Core/TopologyKernel.cc | 14 +++++++------- src/OpenVolumeMesh/Core/TopologyKernel.hh | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/OpenVolumeMesh/Core/OpenVolumeMeshHandle.hh b/src/OpenVolumeMesh/Core/OpenVolumeMeshHandle.hh index 92d9a6c..fb932e6 100644 --- a/src/OpenVolumeMesh/Core/OpenVolumeMeshHandle.hh +++ b/src/OpenVolumeMesh/Core/OpenVolumeMeshHandle.hh @@ -118,7 +118,7 @@ class HEHandleCorrection { public: HEHandleCorrection(HalfEdgeHandle _thld) : thld_(_thld) {} void correctVecValue(std::vector& _vec) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = _vec.begin(), end = _vec.end(); it != end; ++it) { correctValue(*it); } @@ -136,7 +136,7 @@ class HFHandleCorrection { public: HFHandleCorrection(HalfFaceHandle _thld) : thld_(_thld) {} void correctVecValue(std::vector& _vec) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = _vec.begin(), end = _vec.end(); it != end; ++it) { correctValue(*it); } diff --git a/src/OpenVolumeMesh/Core/TopologyKernel.cc b/src/OpenVolumeMesh/Core/TopologyKernel.cc index d2db00f..31c7c1d 100644 --- a/src/OpenVolumeMesh/Core/TopologyKernel.cc +++ b/src/OpenVolumeMesh/Core/TopologyKernel.cc @@ -979,7 +979,7 @@ EdgeIter TopologyKernel::delete_edge_core(const EdgeHandle& _h) { hes.erase(std::remove(hes.begin(), hes.end(), halfedge_handle(_h, 0)), hes.end()); hes.erase(std::remove(hes.begin(), hes.end(), halfedge_handle(_h, 1)), hes.end()); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = hes.begin(), end = hes.end(); it != end; ++it) { cor.correctValue(*it); @@ -1005,7 +1005,7 @@ EdgeIter TopologyKernel::delete_edge_core(const EdgeHandle& _h) { // Decrease all half-edge handles greater than _h in face HEHandleCorrection cor(halfedge_handle(_h, 1)); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = hes.begin(), end = hes.end(); it != end; ++it) { cor.correctValue(*it); @@ -1029,7 +1029,7 @@ EdgeIter TopologyKernel::delete_edge_core(const EdgeHandle& _h) { // 4) if(v_bottom_up_) { HEHandleCorrection cor(halfedge_handle(_h, 1)); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector >::iterator it = outgoing_hes_per_vertex_.begin(), end = outgoing_hes_per_vertex_.end(); it != end; ++it) { cor.correctVecValue(*it); @@ -1119,7 +1119,7 @@ FaceIter TopologyKernel::delete_face_core(const FaceHandle& _h) { hfs.erase(std::remove(hfs.begin(), hfs.end(), halfface_handle(_h, 1)), hfs.end()); HFHandleCorrection cor(halfface_handle(_h, 1)); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = hfs.begin(), end = hfs.end(); it != end; ++it) { cor.correctValue(*it); @@ -1143,7 +1143,7 @@ FaceIter TopologyKernel::delete_face_core(const FaceHandle& _h) { hfs.erase(std::remove(hfs.begin(), hfs.end(), halfface_handle(_h, 1)), hfs.end()); HFHandleCorrection cor(halfface_handle(_h, 1)); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = hfs.begin(), end = hfs.end(); it != end; ++it) { cor.correctValue(*it); @@ -1167,7 +1167,7 @@ FaceIter TopologyKernel::delete_face_core(const FaceHandle& _h) { // 4) if(e_bottom_up_) { HFHandleCorrection cor(halfface_handle(_h, 1)); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector >::iterator it = incident_hfs_per_he_.begin(), end = incident_hfs_per_he_.end(); it != end; ++it) { cor.correctVecValue(*it); } @@ -1223,7 +1223,7 @@ CellIter TopologyKernel::delete_cell_core(const CellHandle& _h) { // 2) if(f_bottom_up_) { CHandleCorrection cor(_h); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(std::vector::iterator it = incident_cell_per_hf_.begin(), end = incident_cell_per_hf_.end(); it != end; ++it) { cor.correctValue(*it); diff --git a/src/OpenVolumeMesh/Core/TopologyKernel.hh b/src/OpenVolumeMesh/Core/TopologyKernel.hh index ee75ab5..b5c3131 100644 --- a/src/OpenVolumeMesh/Core/TopologyKernel.hh +++ b/src/OpenVolumeMesh/Core/TopologyKernel.hh @@ -631,7 +631,7 @@ public: compute_edge_bottom_up_incidences(); if(f_bottom_up_) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(EdgeIter e_it = edges_begin(), e_end = edges_end(); e_it != e_end; ++e_it) { reorder_incident_halffaces(*e_it); @@ -669,7 +669,7 @@ public: if(updateOrder) { if(e_bottom_up_) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9 +#if defined(__clang_major__) && (__clang_major__ >= 5) for(EdgeIter e_it = edges_begin(), e_end = edges_end(); e_it != e_end; ++e_it) { reorder_incident_halffaces(*e_it); -- GitLab