From b9a60c8eb2cac254a0aa576c8d8a88c82e4dbfdf Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Thu, 13 Dec 2012 14:59:23 +0100
Subject: [PATCH] rewrote changes incompatible to MSVS2010
---
GeoLib/AABB.h | 4 ++--
GeoLib/Surface.cpp | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 6b9563be518..12a04af1fb7 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -42,8 +42,8 @@ public:
_max_pnt(std::numeric_limits<double>::min(), std::numeric_limits<double>::min(), std::numeric_limits<double>::min())
{
assert(! ids.empty());
- for (auto i : ids) {
- update(*(pnts[i]));
+ for (unsigned i=0; i<ids.size(); ++i) {
+ update(*(pnts[ids[i]]));
}
}
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index 9675acc7758..1974d1cd519 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -42,7 +42,11 @@ void Surface::addTriangle (std::size_t pnt_a, std::size_t pnt_b, std::size_t pnt
_sfc_triangles.push_back (new Triangle(_sfc_pnts, pnt_a, pnt_b, pnt_c));
if (!_bv) {
- _bv = new AABB<Point>(_sfc_pnts, {pnt_a, pnt_b, pnt_c});
+ std::vector<size_t> ids(3);
+ ids[0] = pnt_a;
+ ids[1] = pnt_b;
+ ids[2] = pnt_c;
+ _bv = new AABB<Point>(_sfc_pnts, ids);
} else {
_bv->update (*_sfc_pnts[pnt_a]);
_bv->update (*_sfc_pnts[pnt_b]);
--
GitLab