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

Do not #define short names in the T2 testsuite

This commit is contained in:
Andreas Fabri 2019-02-14 12:51:52 +01:00
parent 6827ee8e7d
commit 427deceb9e
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Triangulation_2/test/Triangulation_2/include/CGAL/_test_short_names_2.h
View File

@ -1,19 +0,0 @@
#ifndef CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H
#define CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H
// Define shorter names
#define Cartesian Ca
#define Homogeneous Hg
// #define Quotient Qt
#define Triangulation_test_point Ttp
#define Triangulation_test_segment Tts
#define Triangulation_test_line Ttl
#define Triangulation_test_direction Ttd
#define Triangulation_test_ray Ttr
#define Triangulation_test_distance Ttdst
#define _Triangulation_test_traits _Tttr
#endif //CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H

30
Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h
View File

@ -1,34 +1,12 @@
#ifndef CGAL_TEST_TYPES_H #ifndef CGAL_TEST_TYPES_H
#define CGAL_TEST_TYPES_H #define CGAL_TEST_TYPES_H
#include <CGAL/_test_short_names_2.h>
#include <CGAL/basic.h>
#include <iostream> #include <iostream>
#include <cassert> #include <cassert>
#include <CGAL/basic.h>
// #ifdef CGAL_USE_CLN
// #include <CGAL/CLN/cl_integer.h>
// #include <cl_io.h>
// #include <cl_integer_io.h>
// typedef cl_I Rtype;
// #else
// #ifdef CGAL_USE_GMP
// #include <CGAL/Gmpz.h>
// typedef CGAL::Gmpz Rtype;
// #else
// #ifdef CGAL_USE_LEDA
// #include <CGAL/leda_integer.h>
// typedef leda_integer Rtype;
// #else
#include <CGAL/MP_Float.h> #include <CGAL/MP_Float.h>
typedef CGAL::MP_Float Rtype; typedef CGAL::MP_Float Rtype;
//#endif // CGAL_USE_LEDA
//#endif // CGAL_USE_GMP
//#endif // CGAL_USE_CLN
#include <CGAL/Quotient.h> #include <CGAL/Quotient.h>
typedef CGAL::Quotient<CGAL::MP_Float> Ftype; typedef CGAL::Quotient<CGAL::MP_Float> Ftype;
@ -42,11 +20,9 @@ typedef CGAL::Homogeneous<Rtype> Test_rep_homogeneous;
#include <CGAL/Simple_cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/Filtered_kernel.h> #include <CGAL/Filtered_kernel.h>
typedef CGAL::Simple_cartesian<double> K1; typedef CGAL::Simple_cartesian<double> K1;
typedef CGAL::Filtered_kernel<K1> K; typedef CGAL::Filtered_kernel<K1> TestK;
struct TestK : public K {};
typedef CGAL::Quotient<Ftype> Exact_type; typedef CGAL::Quotient<Ftype> Exact_type;
typedef CGAL::Simple_cartesian<Exact_type> Exact_kernel; typedef CGAL::Simple_cartesian<Exact_type> EK;
struct EK : public Exact_kernel {};
#endif #endif