aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/src/BVH
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-06-09 09:30:22 +0200
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-06-09 09:30:22 +0200
commit45d3b405eb1bd3f3f7f4f2043621a57e6bee1365 (patch)
treefc0626af00869c9382f04ec71afecfa1e3c2890a /unsupported/Eigen/src/BVH
parent50e43bc75ad3cccc5e9755bac16c5023dd22eba4 (diff)
Fixed many MSVC warnings.
Diffstat (limited to 'unsupported/Eigen/src/BVH')
-rw-r--r--unsupported/Eigen/src/BVH/BVAlgorithms.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/BVH/BVAlgorithms.h b/unsupported/Eigen/src/BVH/BVAlgorithms.h
index 63725763a..40320291d 100644
--- a/unsupported/Eigen/src/BVH/BVAlgorithms.h
+++ b/unsupported/Eigen/src/BVH/BVAlgorithms.h
@@ -86,9 +86,11 @@ struct ei_intersector_helper2
bool intersectObject(const Object2 &obj) { return intersector.intersectObjectObject(stored, obj); }
Object1 stored;
Intersector &intersector;
+private:
+ ei_intersector_helper2& operator=(const ei_intersector_helper2&);
};
-/** Given two BVH's, runs the query on their cartesian product encapsulated by \a intersector.
+/** Given two BVH's, runs the query on their Cartesian product encapsulated by \a intersector.
* The Intersector type must provide the following members: \code
bool intersectVolumeVolume(const BVH1::Volume &v1, const BVH2::Volume &v2) //returns true if product of volumes intersects the query
bool intersectVolumeObject(const BVH1::Volume &v1, const BVH2::Object &o2) //returns true if the volume-object product intersects the query
@@ -207,6 +209,8 @@ struct ei_minimizer_helper1
Scalar minimumOnObject(const Object1 &obj) { return minimizer.minimumOnObjectObject(obj, stored); }
Object2 stored;
Minimizer &minimizer;
+private:
+ ei_minimizer_helper1& operator=(const ei_minimizer_helper1&) {}
};
template<typename Volume2, typename Object2, typename Object1, typename Minimizer>