mirror of https://github.com/CGAL/cgal
removed a few short names that collided with other names of the Irix and MS compilers
This commit is contained in:
parent
e8400e1d38
commit
b767df4ed5
|
|
@ -22,15 +22,10 @@
|
||||||
#define Td_X_trapezoid TXT
|
#define Td_X_trapezoid TXT
|
||||||
#define Interval_nt IN
|
#define Interval_nt IN
|
||||||
#define PL_X_curve_plus PXCP
|
#define PL_X_curve_plus PXCP
|
||||||
#if ! defined(_MSC_VER)
|
|
||||||
#define bidirectional_iterator_tag BIT
|
|
||||||
#endif
|
|
||||||
#define Forward_circulator_tag FCT
|
#define Forward_circulator_tag FCT
|
||||||
|
|
||||||
#define remove_in_face_interior RIFI
|
#define remove_in_face_interior RIFI
|
||||||
#define I_Polyhedron_const_iterator PCI
|
#define I_Polyhedron_const_iterator PCI
|
||||||
#define _Rb_tree_iterator RTI
|
#define _Rb_tree_iterator RTI
|
||||||
|
|
||||||
#define _Rb_tree RT
|
#define _Rb_tree RT
|
||||||
//#define Trapezoidal_decomposition_2 TD
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@
|
||||||
#define Arr_2_face_base AFB
|
#define Arr_2_face_base AFB
|
||||||
#define In_place_list_iterator IPLI
|
#define In_place_list_iterator IPLI
|
||||||
#define In_place_list_const_iterator IPLCI
|
#define In_place_list_const_iterator IPLCI
|
||||||
#define allocator All
|
|
||||||
#define Pm_traits_wrap_2 PmTW
|
#define Pm_traits_wrap_2 PmTW
|
||||||
#define Td_X_trapezoid TXT
|
#define Td_X_trapezoid TXT
|
||||||
#define PL_X_curve_plus PXCP
|
#define PL_X_curve_plus PXCP
|
||||||
|
|
@ -33,8 +32,6 @@
|
||||||
#define Sweep_curves_base_2 SCB
|
#define Sweep_curves_base_2 SCB
|
||||||
#define Intersection_point_node IPN
|
#define Intersection_point_node IPN
|
||||||
|
|
||||||
// #define bidirectional_iterator_tag BIT
|
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
// Has no effect, probably bug in MSVC
|
// Has no effect, probably bug in MSVC
|
||||||
#pragma warning(disable:4503)
|
#pragma warning(disable:4503)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue