fixes for newer versions of g++

diff --git a/src/moof/line.hh b/src/moof/line.hh
index b40e7cf8c7c8190c9bb59ef5c8d566cda17edc65..35ebf29199afbfa78ef6329fd611f334428892c0 100644 (file)
--- a/src/moof/line.hh
+++ b/src/moof/line.hh
@@ -138,7 +138,7 @@ struct line : public drawable, public shape<D>
        }
 
 
-       bool intersect_ray(const ray<2>& ray, ray<2>::contact& hit) const
+       bool intersect_ray(const ray<2>& ray, moof::ray<2>::contact& hit) const
        {
                vector2 v1 = a - ray.point;
                scalar  a1 = signed_angle_2D(v1, b - ray.point);
@@ -247,7 +247,8 @@ struct polygon : public drawable, public shape<D>
 
        polygon() {}
 
-       bool intersect_ray(const ray<D>& ray, typename ray<D>::contact& hit)
+       bool intersect_ray(const ray<D>& ray,
+                                          typename moof::ray<D>::contact& hit)
        {
                return false;
        }

diff --git a/src/moof/plane.hh b/src/moof/plane.hh
index 3de87e4e3a8ac0bb5f41334321d2c04bfb98c980..5605831a3ca73ba5bbe37cc3b290b0ca3c0c66f9 100644 (file)
--- a/src/moof/plane.hh
+++ b/src/moof/plane.hh
@@ -53,7 +53,7 @@ struct plane : public shape<3>
                d(scalar) {}
 
 
-       bool intersect_ray(const ray<3>& ray, ray<3>::contact& hit)
+       bool intersect_ray(const ray3& ray, ray3::contact& hit)
        {
                // solve: [(ray.point + t*ray.direction) dot normal] + d = 0
 

diff --git a/src/moof/shape.hh b/src/moof/shape.hh
index 7f975032fb6b103dd9d044d3e122696ca2a09eed..25c8c2aa5c43c201436b9708f4042c3a6d4ad28e 100644 (file)
--- a/src/moof/shape.hh
+++ b/src/moof/shape.hh
@@ -58,7 +58,7 @@ public:
         * returned if there is no contact.
         */
        virtual bool intersect_ray(const ray<D>& ray,
-                                                          typename ray<D>::contact& hit) const
+                                                          typename moof::ray<D>::contact& hit) const
        {
                return false;
        }

diff --git a/src/moof/sphere.hh b/src/moof/sphere.hh
index dd4decec8d4224c16945467b820118a9ecdd4d4f..cf1bba772316057ca7e625ab0f1b99ed976151f1 100644 (file)
--- a/src/moof/sphere.hh
+++ b/src/moof/sphere.hh
@@ -109,7 +109,8 @@ struct sphere : public cullable, public drawable, public shape<D>
        }
 
        // a ray inside the sphere will not intersect on its way out
-       bool intersect(const ray<D>& ray, typename ray<D>::contact& hit) const
+       bool intersect(const ray<D>& ray,
+                                  typename moof::ray<D>::contact& hit) const
        {
                vector b = point - ray.point;
                scalar z = dot(b, ray.direction);