songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

also test leda if it is available

This commit is contained in:
Andreas Fabri 2013-03-22 21:39:51 +01:00
parent 464c42cb3d
commit 4b91ac49af
5 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Nef_2/include/CGAL/Nef_2/PM_overlayer.h
View File

@ -39,7 +39,7 @@
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#ifndef CGAL_USE_LEDA #ifndef CGAL_USE_LEDA_LIBRARY
#define LEDA_MEMORY(t) #define LEDA_MEMORY(t)
#endif #endif

2
Nef_2/include/CGAL/Nef_2/PM_point_locator.h
View File

@ -35,7 +35,7 @@
#include <boost/any.hpp> #include <boost/any.hpp>
#endif #endif
#ifdef CGAL_USE_LEDA #ifdef CGAL_USE_LEDA_LIBRARY
#include <CGAL/LEDA_basic.h> #include <CGAL/LEDA_basic.h>
# if __LEDA__ > 410 && __LEDA__ < 441 # if __LEDA__ > 410 && __LEDA__ < 441
# define CGAL_USING_PPL # define CGAL_USING_PPL

27
Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
View File

@ -24,22 +24,9 @@
#define CGAL_NEF_DEBUG 23 #define CGAL_NEF_DEBUG 23
#include <CGAL/Nef_2/debug.h> #include <CGAL/Nef_2/debug.h>
#if defined(CGAL_USE_LEDA) #if defined(CGAL_USE_LEDA_LIBRARY)
#include <CGAL/LEDA_basic.h> #include <CGAL/LEDA_basic.h>
#if CGAL_LEDA_VERSION < 500
#include <LEDA/tuple.h>
#include <LEDA/slist.h>
#include <LEDA/list.h>
#include <LEDA/map.h>
#include <LEDA/map2.h>
#include <LEDA/sortseq.h>
#include <LEDA/p_queue.h>
#include <LEDA/impl/ab_tree.h>
#include <LEDA/impl/bb_tree.h>
#include <LEDA/impl/rb_tree.h>
#include <LEDA/impl/rs_tree.h>
#include <LEDA/impl/skiplist.h>
#else
#include <LEDA/core/tuple.h> #include <LEDA/core/tuple.h>
#include <LEDA/core/slist.h> #include <LEDA/core/slist.h>
#include <LEDA/core/list.h> #include <LEDA/core/list.h>
@ -52,7 +39,7 @@
#include <LEDA/core/impl/rb_tree.h> #include <LEDA/core/impl/rb_tree.h>
#include <LEDA/core/impl/rs_tree.h> #include <LEDA/core/impl/rs_tree.h>
#include <LEDA/core/impl/skiplist.h> #include <LEDA/core/impl/skiplist.h>
#endif
#include <utility> #include <utility>
#include <sstream> #include <sstream>
@ -444,8 +431,8 @@ public:
} // namespace CGAL } // namespace CGAL
#endif // defined(CGAL_USE_LEDA) #endif // defined(CGAL_USE_LEDA_LIBRARY)
#if !defined(CGAL_USE_LEDA) #if !defined(CGAL_USE_LEDA_LIBRARY)
#include <list> #include <list>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -1123,10 +1110,10 @@ public:
} // namespace CGAL } // namespace CGAL
#endif // !defined(CGAL_USE_LEDA) #endif // !defined(CGAL_USE_LEDA_LIBRARY)
namespace CGAL { namespace CGAL {
#if defined(CGAL_USE_LEDA) #if defined(CGAL_USE_LEDA_LIBRARY)
#define Segment_overlay_traits leda_seg_overlay_traits #define Segment_overlay_traits leda_seg_overlay_traits
static const char* const sweepversion = "LEDA segment overlay sweep"; static const char* const sweepversion = "LEDA segment overlay sweep";
#else #else

17
Nef_2/test/Nef_2/Nef_polyhedron_2-test.cpp
View File

@ -4,23 +4,16 @@
#include <CGAL/Filtered_extended_homogeneous.h> #include <CGAL/Filtered_extended_homogeneous.h>
#include <CGAL/Extended_cartesian.h> #include <CGAL/Extended_cartesian.h>
#include <CGAL/Nef_polyhedron_2.h> #include <CGAL/Nef_polyhedron_2.h>
#include <CGAL/Arithmetic_kernel.h>
#ifdef CGAL_USE_LEDA #if defined (CGAL_USE_LEDA) || defined (CGAL_USE_GMP)
#include <CGAL/leda_integer.h>
#include <CGAL/leda_rational.h> typedef CGAL::Arithmetic_kernel::Integer Integer;
typedef leda_integer Integer; typedef CGAL::Arithmetic_kernel::Rational Rational;
typedef leda_rational Rational;
#else
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
#include <CGAL/Gmpq.h>
typedef CGAL::Gmpz Integer;
typedef CGAL::Gmpq Rational;
#else #else
typedef long Integer; typedef long Integer;
typedef double Rational; typedef double Rational;
#endif #endif
#endif

5
Nef_2/test/Nef_2/nef_2_point_location.cpp
View File

@ -1,6 +1,7 @@
// file : examples/Nef_2/point_location.C // file : examples/Nef_2/point_location.C
#include <CGAL/Gmpz.h>
#include <CGAL/Arithmetic_kernel.h>
#include <CGAL/Bounded_kernel.h> #include <CGAL/Bounded_kernel.h>
#include <CGAL/Homogeneous.h> #include <CGAL/Homogeneous.h>
#include <CGAL/Filtered_extended_homogeneous.h> #include <CGAL/Filtered_extended_homogeneous.h>
@ -51,7 +52,7 @@ void test() {
int main() { int main() {
typedef CGAL::Gmpz RT; typedef CGAL::Arithmetic_kernel::Integer RT;
typedef CGAL::Filtered_extended_homogeneous<RT> EKernel; typedef CGAL::Filtered_extended_homogeneous<RT> EKernel;
typedef CGAL::Homogeneous<RT> HOM; typedef CGAL::Homogeneous<RT> HOM;
typedef CGAL::Bounded_kernel<HOM> BKernel; typedef CGAL::Bounded_kernel<HOM> BKernel;