aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/src/BVH
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2009-12-12 11:39:07 +0100
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2009-12-12 11:39:07 +0100
commitd088ee35f644f9178270f0c3dc8c76011d208099 (patch)
tree47001aacbb83eba02c38d93ec97fbe09e7c8497c /unsupported/Eigen/src/BVH
parent494a88685ee995b34da0f3b79a68fa06c0ee63ff (diff)
Added to possibility to compile unit tests at maximum warning level.
Silenced (amongst others) many conversion related warnings.
Diffstat (limited to 'unsupported/Eigen/src/BVH')
-rw-r--r--unsupported/Eigen/src/BVH/BVAlgorithms.h4
-rw-r--r--unsupported/Eigen/src/BVH/KdBVH.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/unsupported/Eigen/src/BVH/BVAlgorithms.h b/unsupported/Eigen/src/BVH/BVAlgorithms.h
index 47c49be7f..63725763a 100644
--- a/unsupported/Eigen/src/BVH/BVAlgorithms.h
+++ b/unsupported/Eigen/src/BVH/BVAlgorithms.h
@@ -74,6 +74,8 @@ struct ei_intersector_helper1
bool intersectObject(const Object1 &obj) { return intersector.intersectObjectObject(obj, stored); }
Object2 stored;
Intersector &intersector;
+private:
+ ei_intersector_helper1& operator=(const ei_intersector_helper1&);
};
template<typename Volume2, typename Object2, typename Object1, typename Intersector>
@@ -216,6 +218,8 @@ struct ei_minimizer_helper2
Scalar minimumOnObject(const Object2 &obj) { return minimizer.minimumOnObjectObject(stored, obj); }
Object1 stored;
Minimizer &minimizer;
+private:
+ ei_minimizer_helper2& operator=(const ei_minimizer_helper2&);
};
/** Given two BVH's, runs the query on their cartesian product encapsulated by \a minimizer.
diff --git a/unsupported/Eigen/src/BVH/KdBVH.h b/unsupported/Eigen/src/BVH/KdBVH.h
index ec47254af..c4719607f 100644
--- a/unsupported/Eigen/src/BVH/KdBVH.h
+++ b/unsupported/Eigen/src/BVH/KdBVH.h
@@ -107,7 +107,7 @@ public:
children.clear();
objects.insert(objects.end(), begin, end);
- int n = objects.size();
+ int n = static_cast<int>(objects.size());
if(n < 2)
return; //if we have at most one object, we don't need any internal nodes
@@ -149,7 +149,7 @@ public:
return;
}
- int numBoxes = boxes.size();
+ int numBoxes = static_cast<int>(boxes.size());
int idx = index * 2;
if(children[idx + 1] < numBoxes) { //second index is always bigger