mirror of https://github.com/CGAL/cgal
Get rid of CGAL_REP_CLASS_DEFINED
This commit is contained in:
parent
c2651f99e7
commit
7b114599ad
|
|
@ -17,16 +17,11 @@
|
||||||
//
|
//
|
||||||
// Author(s) : Stefan Schirra
|
// Author(s) : Stefan Schirra
|
||||||
|
|
||||||
|
|
||||||
#ifndef CGAL_CONVEX_HULL_2_H
|
#ifndef CGAL_CONVEX_HULL_2_H
|
||||||
#define CGAL_CONVEX_HULL_2_H
|
#define CGAL_CONVEX_HULL_2_H
|
||||||
|
|
||||||
#include <CGAL/basic.h>
|
#include <CGAL/basic.h>
|
||||||
|
|
||||||
#ifdef CGAL_REP_CLASS_DEFINED
|
|
||||||
#include <CGAL/convex_hull_traits_2.h>
|
#include <CGAL/convex_hull_traits_2.h>
|
||||||
#endif // CGAL_REP_CLASS_DEFINED
|
|
||||||
|
|
||||||
#include <CGAL/ch_akl_toussaint.h>
|
#include <CGAL/ch_akl_toussaint.h>
|
||||||
#include <CGAL/ch_bykat.h>
|
#include <CGAL/ch_bykat.h>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
|
|
@ -192,13 +187,7 @@ upper_hull_points_2(ForwardIterator first, ForwardIterator last,
|
||||||
typedef typename KTraits::Kernel Kernel;
|
typedef typename KTraits::Kernel Kernel;
|
||||||
return upper_hull_points_2(first, last, result, Kernel());
|
return upper_hull_points_2(first, last, result, Kernel());
|
||||||
}
|
}
|
||||||
|
|
||||||
CGAL_END_NAMESPACE
|
CGAL_END_NAMESPACE
|
||||||
|
|
||||||
#endif // CGAL_CONVEX_HULL_2_H
|
#endif // CGAL_CONVEX_HULL_2_H
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
#include <CGAL/distance_predicates_2.h>
|
#include <CGAL/distance_predicates_2.h>
|
||||||
|
|
||||||
CGAL_BEGIN_NAMESPACE
|
CGAL_BEGIN_NAMESPACE
|
||||||
|
|
||||||
template <class K_>
|
template <class K_>
|
||||||
class Convex_hull_traits_2 : public K_
|
class Convex_hull_traits_2 : public K_
|
||||||
{
|
{
|
||||||
|
|
@ -72,10 +73,8 @@ public:
|
||||||
|
|
||||||
template <class K>
|
template <class K>
|
||||||
class convex_hull_traits_2 : public Convex_hull_traits_2<K>
|
class convex_hull_traits_2 : public Convex_hull_traits_2<K>
|
||||||
{
|
{};
|
||||||
};
|
|
||||||
|
|
||||||
CGAL_END_NAMESPACE
|
CGAL_END_NAMESPACE
|
||||||
|
|
||||||
#endif // CGAL_CONVEX_HULL_TRAITS_2_H
|
#endif // CGAL_CONVEX_HULL_TRAITS_2_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,42 +13,22 @@
|
||||||
//
|
//
|
||||||
// $URL$
|
// $URL$
|
||||||
// $Id$
|
// $Id$
|
||||||
//
|
|
||||||
//
|
//
|
||||||
// Author(s) : Menelaos Karavelas <mkaravel@cse.nd.edu>
|
// Author(s) : Menelaos Karavelas <mkaravel@cse.nd.edu>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
#ifndef CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
||||||
#define CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
#define CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
||||||
|
|
||||||
#include <CGAL/Segment_Delaunay_graph_2/basic.h>
|
#include <CGAL/Segment_Delaunay_graph_2/basic.h>
|
||||||
|
|
||||||
#ifndef CGAL_REP_CLASS_DEFINED
|
|
||||||
#error no representation class defined
|
|
||||||
#endif // CGAL_REP_CLASS_DEFINED
|
|
||||||
|
|
||||||
#if defined CGAL_CARTESIAN_H || defined CGAL_SIMPLE_CARTESIAN_H
|
|
||||||
#include <CGAL/Segment_Delaunay_graph_2/Predicates_C2.h>
|
#include <CGAL/Segment_Delaunay_graph_2/Predicates_C2.h>
|
||||||
#include <CGAL/Segment_Delaunay_graph_2/Constructions_C2.h>
|
#include <CGAL/Segment_Delaunay_graph_2/Constructions_C2.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#include <CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h>
|
#include <CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h>
|
||||||
|
|
||||||
|
|
||||||
CGAL_BEGIN_NAMESPACE
|
CGAL_BEGIN_NAMESPACE
|
||||||
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
// the Traits class
|
// the Traits class
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
template<class R, class MTag, class ITag>
|
template<class R, class MTag, class ITag>
|
||||||
class Segment_Delaunay_graph_traits_base_2
|
class Segment_Delaunay_graph_traits_base_2
|
||||||
|
|
@ -254,7 +234,6 @@ public:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
CGAL_END_NAMESPACE
|
CGAL_END_NAMESPACE
|
||||||
|
|
||||||
#endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
#endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue