diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-02-24 20:16:52 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-02-24 20:16:52 +0400 |
| commit | 036d35dd2471bc490c266cf4f7d4aba10080cb10 (patch) | |
| tree | 2c943bb8695fe0789ca33d94b6c9f59a838fa86f /extern | |
| parent | 7ef1ed15f10c46275486fce1bca0b0355848b32d (diff) | |
Fix for MSVC 2008 compiler errors.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/carve/include/carve/mesh_simplify.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/carve/include/carve/mesh_simplify.hpp b/extern/carve/include/carve/mesh_simplify.hpp index 2126c57011b..f0a0a965707 100644 --- a/extern/carve/include/carve/mesh_simplify.hpp +++ b/extern/carve/include/carve/mesh_simplify.hpp @@ -1470,7 +1470,7 @@ namespace carve { heapval_t last; std::vector<heapval_t> heap; - point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow(_base, _n_dp)), last(-1.0, _origin), heap() { + point_enumerator_t(vector_t _origin, int _base, int _n_dp) : origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0, _origin), heap() { for (size_t i = 0; i < (1 << 3); ++i) { vector_t t = origin; for (size_t j = 0; j < 3; ++j) { @@ -1527,7 +1527,7 @@ namespace carve { } aabb_t getAABB() const { - std::set<face_t *>::iterator i = faces.begin(); + std::set<face_t *>::const_iterator i = faces.begin(); aabb_t aabb = (*i)->getAABB(); while (++i != faces.end()) { aabb.unionAABB((*i)->getAABB()); |