Commit b6935c2b authored by Jan Möbius's avatar Jan Möbius

Fixed remaining bad ifdefs

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@279 66977474-1d4b-4f09-8fe9-267525286df2
parent ab4fdf8b
......@@ -118,7 +118,7 @@ class HEHandleCorrection {
public:
HEHandleCorrection(HalfEdgeHandle _thld) : thld_(_thld) {}
void correctVecValue(std::vector<HalfEdgeHandle>& _vec) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
#if defined(__clang_major__) && (__clang_major__ >= 5)
for(std::vector<HalfEdgeHandle>::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<HalfFaceHandle>& _vec) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
#if defined(__clang_major__) && (__clang_major__ >= 5)
for(std::vector<HalfFaceHandle>::iterator it = _vec.begin(), end = _vec.end(); it != end; ++it) {
correctValue(*it);
}
......
......@@ -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<HalfEdgeHandle>::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<HalfEdgeHandle>::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<std::vector<HalfEdgeHandle> >::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<HalfFaceHandle>::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<HalfFaceHandle>::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<std::vector<HalfFaceHandle> >::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<CellHandle>::iterator it = incident_cell_per_hf_.begin(),
end = incident_cell_per_hf_.end(); it != end; ++it) {
cor.correctValue(*it);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment