Removed cruft from Intersection_traits and Kernel_d now uses the macros do declare global functions

This commit is contained in:
Philipp Möller
2011-11-21 13:52:39 +00:00
parent 66ef67491a
commit 3fe7c7b9dd
3 changed files with 44 additions and 23 deletions
@@ -142,6 +142,18 @@ template<class R>
class Intersect
{
public:
template<typename A, typename B>
struct Result {
typedef typename Intersection_traits<R, A, B>::result_type Type;
// Boost MPL compatibility
typedef Type type;
};
// Solely to make the lazy kernel work
#if CGAL_INTERSECTION_VERSION < 2
typedef CGAL::Object result_type;
#endif
template <class T1, class T2>
typename Intersection_traits<R, T1, T2>::result_type
operator()(const T1& t1, const T2& t2) const