change CGAL_HAVE_.. CGAL_HAS..

This commit is contained in:
Michael Hemmer 2010-02-11 17:56:29 +00:00
parent 286b4734a3
commit c9074430d3
15 changed files with 30 additions and 30 deletions

View File

@ -41,26 +41,26 @@
namespace CGAL{
#ifndef CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAVE_LEDA_ARITHMETIC_KERNEL)
#ifndef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAS_LEDA_ARITHMETIC_KERNEL)
typedef LEDA_arithmetic_kernel Arithmetic_kernel;
#define CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL 1
#define CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL 1
#endif // CGAL_USE_LEDA
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#ifndef CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAVE_GMP_ARITHMETIC_KERNEL)
#ifndef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAS_GMP_ARITHMETIC_KERNEL)
typedef GMP_arithmetic_kernel Arithmetic_kernel;
#define CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL 1
#define CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL 1
#endif // CGAL_USE_GMP
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#ifndef CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAVE_LEDA_ARITHMETIC_KERNEL)
#ifndef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#if defined(CGAL_HAS_LEDA_ARITHMETIC_KERNEL)
typedef CORE_arithmetic_kernel Arithmetic_kernel;
#define CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL 1
#define CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL 1
#endif // CGAL_USE_CORE
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
} // namespace CGAL

View File

@ -32,7 +32,7 @@
#ifdef CGAL_USE_CORE
#define CGAL_HAVE_CORE_ARITHMETIC_KERNEL
#define CGAL_HAS_CORE_ARITHMETIC_KERNEL
#include <CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h>
#include <CGAL/Get_arithmetic_kernel.h>

View File

@ -37,7 +37,7 @@
#ifdef CGAL_USE_GMP
#ifdef CGAL_USE_MPFI
#define CGAL_HAVE_GMP_ARITHMETIC_KERNEL
#define CGAL_HAS_GMP_ARITHMETIC_KERNEL
#include <CGAL/Gmpz.h>
#include <CGAL/Gmpq.h>

View File

@ -30,7 +30,7 @@
#ifdef CGAL_USE_LEDA
#define CGAL_HAVE_LEDA_ARITHMETIC_KERNEL
#define CGAL_HAS_LEDA_ARITHMETIC_KERNEL
#include <CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h>
#include <CGAL/Get_arithmetic_kernel.h>

View File

@ -2,7 +2,7 @@
#include <CGAL/basic.h>
#include <CGAL/Arithmetic_kernel.h>
#if defined(CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL)
#if defined(CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL)
#include <CGAL/Test/_test_arithmetic_kernel.h>

View File

@ -3,7 +3,7 @@
#include <CGAL/CORE_arithmetic_kernel.h>
#ifdef CGAL_HAVE_CORE_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_CORE_ARITHMETIC_KERNEL
#include <CGAL/Test/_test_arithmetic_kernel.h>
int main() {

View File

@ -2,7 +2,7 @@
#include <CGAL/basic.h>
#include <CGAL/GMP_arithmetic_kernel.h>
#ifdef CGAL_HAVE_GMP_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_GMP_ARITHMETIC_KERNEL
#include <CGAL/Test/_test_arithmetic_kernel.h>

View File

@ -2,7 +2,7 @@
#include <CGAL/basic.h>
#include <CGAL/LEDA_arithmetic_kernel.h>
#ifdef CGAL_HAVE_LEDA_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_LEDA_ARITHMETIC_KERNEL
#include <CGAL/Test/_test_arithmetic_kernel.h>

View File

@ -1,6 +1,6 @@
#include <iostream>
#include <CGAL/basic.h>
#ifdef CGAL_HAVE_GMP_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_GMP_ARITHMETIC_KERNEL
#include <CGAL/Gmpfr_interval.h>
#include <CGAL/Test/_test_algebraic_structure.h>
#include <CGAL/Test/_test_real_embeddable.h>

View File

@ -433,9 +433,9 @@ int main(){
// test_vector_d();
#ifdef CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
AT_coercion_test_for_cgal_types_fws<CGAL::Arithmetic_kernel>();
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
#ifdef CGAL_USE_LEDA
check_type_coercion_at<CGAL::LEDA_arithmetic_kernel>();

View File

@ -32,7 +32,7 @@ int main()
CGAL::orientation(p, q, r);
#ifdef CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
{ // Integer
typedef CGAL::Arithmetic_kernel::Integer Integer;
typedef CGAL::Number_type_checker<Integer,Integer> NT;
@ -47,6 +47,6 @@ int main()
typedef CGAL::Tag_true Is_exact;
CGAL::test_algebraic_structure<NT,Tag, Is_exact>();
}
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
return 0;
}

View File

@ -158,7 +158,7 @@ void test_coercion_traits(){
}
int main(){
#if CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
typedef CGAL::Arithmetic_kernel AK;
test_coercion_traits<AK>();
#endif

View File

@ -51,7 +51,7 @@ void test_interpolator(){
//std::cout << "end interpolate: " << PT::d << std::endl;
}
#if CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
int main(){
@ -94,4 +94,4 @@ int main(){
return 0;
}
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL

View File

@ -256,7 +256,7 @@ void test_canonicalize(){
int main(){
#if CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
typedef CGAL::Arithmetic_kernel AK;
test_polynomial_utils<AK>();
test_canonicalize<AK>();

View File

@ -65,7 +65,7 @@ void test_resultant(){
//std::cout << "end resultant: " << PT::d << std::endl;
}
#if CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#if CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
int main(){
@ -125,6 +125,6 @@ int main(){
return 0;
}
#endif // CGAL_HAVE_DEFAULT_ARITHMETIC_KERNEL
#endif // CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL