From b767df4ed5e2fce9ea837cd405e840dbf97c20b7 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Sun, 19 Oct 2003 21:38:36 +0000 Subject: [PATCH] removed a few short names that collided with other names of the Irix and MS compilers --- Packages/Planar_map/examples/Planar_map/short_names.h | 7 +------ Packages/Sweep_line_2/examples/Sweep_line_2/short_names.h | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Packages/Planar_map/examples/Planar_map/short_names.h b/Packages/Planar_map/examples/Planar_map/short_names.h index 54c351d539c..5268eb9bac5 100644 --- a/Packages/Planar_map/examples/Planar_map/short_names.h +++ b/Packages/Planar_map/examples/Planar_map/short_names.h @@ -22,15 +22,10 @@ #define Td_X_trapezoid TXT #define Interval_nt IN #define PL_X_curve_plus PXCP -#if ! defined(_MSC_VER) -#define bidirectional_iterator_tag BIT -#endif #define Forward_circulator_tag FCT - #define remove_in_face_interior RIFI #define I_Polyhedron_const_iterator PCI #define _Rb_tree_iterator RTI - #define _Rb_tree RT -//#define Trapezoidal_decomposition_2 TD + #endif diff --git a/Packages/Sweep_line_2/examples/Sweep_line_2/short_names.h b/Packages/Sweep_line_2/examples/Sweep_line_2/short_names.h index 7a2e28715ec..d5036309f68 100644 --- a/Packages/Sweep_line_2/examples/Sweep_line_2/short_names.h +++ b/Packages/Sweep_line_2/examples/Sweep_line_2/short_names.h @@ -24,7 +24,6 @@ #define Arr_2_face_base AFB #define In_place_list_iterator IPLI #define In_place_list_const_iterator IPLCI -#define allocator All #define Pm_traits_wrap_2 PmTW #define Td_X_trapezoid TXT #define PL_X_curve_plus PXCP @@ -33,8 +32,6 @@ #define Sweep_curves_base_2 SCB #define Intersection_point_node IPN -// #define bidirectional_iterator_tag BIT - #if defined(_MSC_VER) // Has no effect, probably bug in MSVC #pragma warning(disable:4503)