diff options
author | Oliver Lehmann <oliver@FreeBSD.org> | 2014-03-24 18:10:01 +0000 |
---|---|---|
committer | Oliver Lehmann <oliver@FreeBSD.org> | 2014-03-24 18:10:01 +0000 |
commit | db615b95fb2a798ce510cc4a9b06d336f434580b (patch) | |
tree | 9d47710e3f3cbc30076dfd7270a9f38cca2dc911 /math/wfmath | |
parent | 7bc65528c13fcc179e4c38ec263165357d081bed (diff) |
Notes
Diffstat (limited to 'math/wfmath')
-rw-r--r-- | math/wfmath/patch-wfmath-axisbox.h | 21 | ||||
-rw-r--r-- | math/wfmath/patch-wfmath-rotbox.h | 21 |
2 files changed, 0 insertions, 42 deletions
diff --git a/math/wfmath/patch-wfmath-axisbox.h b/math/wfmath/patch-wfmath-axisbox.h deleted file mode 100644 index 82d9bd95a493..000000000000 --- a/math/wfmath/patch-wfmath-axisbox.h +++ /dev/null @@ -1,21 +0,0 @@ ---- wfmath/axisbox.h.orig 2014-03-10 19:19:47.000000000 +0100 -+++ wfmath/axisbox.h 2014-03-10 19:20:00.000000000 +0100 -@@ -153,6 +153,9 @@ - /// Get the minimal box that contains a1 and a2 - friend AxisBox Union<dim>(const AxisBox& a1, const AxisBox& a2); - -+ friend bool Intersect<2>(const RotBox<2>& r, const AxisBox<2>& b, bool proper); -+ friend bool Intersect<3>(const RotBox<3>& r, const AxisBox<3>& b, bool proper); -+ - friend bool Intersect<dim>(const AxisBox& b, const Point<dim>& p, bool proper); - friend bool Contains<dim>(const Point<dim>& p, const AxisBox& b, bool proper); - -@@ -174,8 +177,6 @@ - friend bool Contains<dim>(const Polygon<dim>& p, const AxisBox& b, bool proper); - friend bool Contains<dim>(const AxisBox& b, const Polygon<dim>& p, bool proper); - -- private: -- - Point<dim> m_low, m_high; - }; - diff --git a/math/wfmath/patch-wfmath-rotbox.h b/math/wfmath/patch-wfmath-rotbox.h deleted file mode 100644 index d3dba9fa2978..000000000000 --- a/math/wfmath/patch-wfmath-rotbox.h +++ /dev/null @@ -1,21 +0,0 @@ ---- wfmath/rotbox.h.orig 2014-03-10 19:19:38.000000000 +0100 -+++ wfmath/rotbox.h 2014-03-10 19:19:56.000000000 +0100 -@@ -159,6 +159,9 @@ - RotBox toParentCoords(const Point<dim>& origin, const Quaternion& rotation) const; - RotBox toLocalCoords(const Point<dim>& origin, const Quaternion& rotation) const; - -+ friend bool Intersect<2>(const RotBox<2>& r, const AxisBox<2>& b, bool proper); -+ friend bool Intersect<3>(const RotBox<3>& r, const AxisBox<3>& b, bool proper); -+ - friend bool Intersect<dim>(const RotBox& r, const Point<dim>& p, bool proper); - friend bool Contains<dim>(const Point<dim>& p, const RotBox& r, bool proper); - -@@ -181,8 +184,6 @@ - friend bool Contains<dim>(const Polygon<dim>& p, const RotBox& r, bool proper); - friend bool Contains<dim>(const RotBox& r, const Polygon<dim>& p, bool proper); - -- private: -- - Point<dim> m_corner0; - Vector<dim> m_size; - RotMatrix<dim> m_orient; |