Arrangements

This commit is contained in:
Andreas Fabri 2018-01-18 15:05:34 +00:00
parent f4ec38e27c
commit 18acb2ece9
65 changed files with 206 additions and 9 deletions

View File

@ -27,6 +27,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
#define CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Polynomial_type_generator.h>
#include <CGAL/Polynomial_traits_d.h>
@ -524,4 +526,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H

View File

@ -24,7 +24,7 @@
#define CGAL_ARR_BEZIER_CURVE_TRAITS_2_H
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_Bezier_curve_traits_2 class.
@ -881,4 +881,5 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,8 @@
#ifndef CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
#define CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
#include <CGAL/disable_warnings.h>
#include <CGAL/config.h>
#include <CGAL/Algebraic_kernel_d/flags.h>
@ -657,4 +659,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/No_intersection_surface_sweep_2.h>
#include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@ -145,4 +147,6 @@ locate(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the Arr_bounded_planar_topology_traits_2<GeomTraits> class.
@ -551,4 +553,6 @@ public:
#include <CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arr_circle_segment_traits_2<Kenrel> class.
@ -749,4 +750,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -29,6 +29,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -180,4 +181,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_CIRCULAR_ARC_TRAITS_H

View File

@ -29,6 +29,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -620,4 +622,6 @@ namespace CGAL {
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_VARIANT_TRAITS_H

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The conic traits-class for the arrangement package.
@ -875,5 +876,7 @@ public:
//@}
};
#include <CGAL/enable_warnings.h>
} //namespace CGAL
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_consolidated_curve_data_traits_2<Traits,Data> class.
@ -99,4 +100,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* A counting traits-class for the arrangement package.
@ -1066,4 +1067,6 @@ Out_stream& operator<<(Out_stream& os,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_curve_data_traits_2<> class template.
*/
@ -441,4 +443,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the base DCEL class for planar arrangements and its
@ -1459,4 +1460,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the Arr_default_dcel<Traits> class.
@ -67,4 +68,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of default overlay-traits classes.
@ -91,4 +93,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_non_caching_segment_basic_traits_2.h>
@ -154,4 +155,6 @@ public:
}
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the enumeration types for the arrangement package.
@ -216,4 +217,6 @@ InputStream& operator>>(
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the extended DCEL classes.
@ -285,4 +286,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_face_index_map<Arrangement> class.
@ -278,4 +279,6 @@ unsigned int get (const CGAL::Arr_face_index_map<Arrangement>& index_map,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The partition traits class for geodesic arcs on the sphere enables
@ -616,4 +617,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ARR_GEODESIC_ARC_ON_SPHERE_PARTITION_TRAITS_2_H

View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
// #define CGAL_FULL_X_MONOTONE_GEODESIC_ARC_ON_SPHERE_IS_SUPPORTED 1
@ -3255,4 +3256,5 @@ operator>>(InputStream& is,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_landmarks_point_location<Arrangement> template.
@ -318,4 +319,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_landmarks_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -29,6 +29,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -128,4 +129,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_LINE_ARC_TRAITS_H

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for handling linear objects (lines, rays and segments)
@ -2026,4 +2027,6 @@ InputStream& operator>> (InputStream& is, Arr_linear_object_2<Kernel>& lobj)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_point_location_result.h>
#include <CGAL/Arrangement_2/Arr_traits_adaptor_2.h>
@ -120,4 +121,6 @@ public:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_naive_point_location_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -30,6 +30,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file The basic non-caching segment traits-class for the arrangement
* package. This traits class handles x-monotone non-intersecting segments.
@ -282,4 +283,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file The non-caching segment traits-class for the arrangement package.
* This traits class handles general segments. It is a model of the
@ -433,4 +434,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_enums.h>
@ -678,4 +679,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the global Arr_overlay_2() function.
@ -260,4 +262,6 @@ overlay(const Arrangement_on_surface_2<GeometryTraitsA_2, TopologyTraitsA>& arr1
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
// The macro CGAL_ARR_POINT_LOCATION_VERSION controls which version of the
// point location is used. Currently two values are supported:
@ -118,4 +119,6 @@ struct Arr_point_location_result {
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the general piece-wise (polycurve) type of curves of the
@ -2728,4 +2729,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the general piece-wise (polycurve) type of curves of the
@ -1188,4 +1189,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -27,6 +27,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the linear piece-wiese(polyline) type of curves of the
@ -608,4 +609,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/assertions.h>
#include <CGAL/tags.h>
@ -1315,5 +1316,6 @@ public:
} //namespace CGAL {
#include <CGAL/enable_warnings.h>
#endif //CGAL_ARR_RATIONAL_ARC_TRAITS_D_1_H

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The segment traits-class for the arrangement package.
@ -1175,5 +1176,6 @@ InputStream& operator>>(InputStream& is, Arr_segment_2<Kernel>& seg)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_simple_point_location<Arrangement> template.
@ -195,4 +196,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_simple_point_location_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* The topology traits for great spherical arcs embedded on a sphere for the
@ -668,4 +670,6 @@ protected:
#include <CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/config.h>
#include <boost/type_traits.hpp>
@ -646,5 +647,7 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* A tracing traits-class for the arrangement package.
@ -1274,4 +1275,6 @@ OutputStream & operator<<(OutputStream & os, Comparison_result cr)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_trapezoid_ric_point_location<Arrangement> template.
@ -426,4 +427,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -23,6 +23,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_triangulation_point_location<Arrangement> template.
@ -390,4 +392,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_triangulation_pl_functions.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the Arr_unb_planar_topology_traits_2<GeomTraits> class.
@ -594,4 +596,6 @@ protected:
#include <CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_vertex_index_map<Arrangement> class.
@ -282,4 +284,6 @@ unsigned int get (const CGAL::Arr_vertex_index_map<Arrangement>& index_map,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -23,6 +23,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/No_intersection_surface_sweep_2.h>
#include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@ -148,4 +150,6 @@ decompose(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_walk_along_line_point_location<Arrangement> template.
@ -206,4 +207,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_2<Traits,Dcel> class.
@ -255,4 +256,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -31,6 +31,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_on_surface_2<Traits,Dcel> class.
@ -3010,4 +3011,5 @@ bool do_intersect(Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
#include <CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h>
#include <CGAL/Arrangement_2/Arrangement_on_surface_2_global.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_on_surface_with_history_2 class.
@ -995,4 +996,6 @@ overlay (const Arrangement_on_surface_with_history_2<GeomTraits, TopTraits1>&
// The function definitions can be found under:
#include <CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_with_history_2<Traits,Dcel> class.
@ -274,4 +275,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -26,6 +26,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Defintion of the Arrangement_zone_2 class.
@ -443,4 +445,6 @@ private:
// The function definitions can be found under:
#include <CGAL/Arrangement_2/Arrangement_zone_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The number-type traits for CORE algebraic numbers.
@ -621,4 +623,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the specialized boost::graph_traits<Arrangement_2> class.
@ -610,4 +612,6 @@ edges (const CGAL::Arrangement_on_surface_2<GeomTraits, TopTraits>& arr)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the specialized Dual<Arrangement_2> class,
@ -749,4 +750,6 @@ edges (const CGAL::Dual<CGAL::
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

View File

@ -14,6 +14,8 @@
#include "utils.h"
#include "IO_base_test.h"
#include <CGAL/disable_warnings.h>
/*! Construction test */
template <typename T_Geom_traits, typename T_Topol_traits>
class Construction_test :
@ -675,4 +677,6 @@ bool Construction_test<T_Geom_traits, T_Topol_traits>::perform()
return true;
}
#include <CGAL/enable_warnings.h>
#endif

View File

@ -3,6 +3,7 @@
template <typename GeomTraits_>
class IO_base_test {
IO_base_test<GeomTraits_>& operator=(const IO_base_test<GeomTraits_>&);
public:
typedef GeomTraits_ Geom_traits;
typedef typename Geom_traits::Point_2 Point_2;

View File

@ -17,6 +17,8 @@
#include <CGAL/Arr_point_location_result.h>
#include <CGAL/Arr_triangulation_point_location.h>
#include <CGAL/disable_warnings.h>
#include "IO_test.h"
/*! Point location test */
@ -927,4 +929,6 @@ verify(Variants_vector objs[MAX_NUM_POINT_LOCATION_STRATEGIES],
return result;
}
#include <CGAL/enable_warnings.h>
#endif

View File

@ -52,6 +52,7 @@
template <typename Geom_traits_T>
class Traits_base_test : public IO_test<Geom_traits_T> {
Traits_base_test<Geom_traits_T>& operator=(const Traits_base_test<Geom_traits_T>&);
protected:
typedef Geom_traits_T Traits;
typedef IO_test<Traits> Base;

View File

@ -24,6 +24,7 @@
template <typename Geom_traits_T>
class Traits_test : public Traits_base_test<Geom_traits_T> {
private:
Traits_test<Geom_traits_T>& operator=(const Traits_test<Geom_traits_T>&);
typedef Geom_traits_T Traits;
typedef Traits_base_test<Traits> Base;
typedef typename Base::Enum_type Enum_type;
@ -1456,7 +1457,7 @@ compare_x_at_limit_wrapper_imp(std::istringstream& str_stream,
std::cout << "Test: compare_x_at_limit( ";
CGAL::Comparison_result real_answer;
unsigned int id1, id2;
unsigned int id1 = 0, id2 = 0 ;
// first argument must be a number (either a point or a xcurve)
str_stream >> id1;
std::pair<Enum_type, unsigned int> next_input =

View File

@ -29,6 +29,7 @@ typedef Traits_2::Point_2 Point_2;
template <typename Cmp_object>
struct Cmp {
Cmp<Cmp_object>& operator=(const Cmp<Cmp_object>&);
const Cmp_object& m_cmp_object;
Cmp(const Cmp_object& cmp_object) : m_cmp_object(cmp_object) {}
bool operator()(const Point_2& p1, const Point_2& p2) const

View File

@ -4,6 +4,8 @@
#include <CGAL/Arr_enums.h>
#include <CGAL/Arr_tags.h>
#include <CGAL/disable_warnings.h>
template <typename T_Geom_traits>
class Point_compare {
private:
@ -129,3 +131,5 @@ public:
return (res == CGAL::SMALLER) ? true : false;
}
};
#include <CGAL/enable_warnings.h>

View File

@ -34,6 +34,8 @@
#ifndef CGAL_POLYNOMIAL_H
#define CGAL_POLYNOMIAL_H
#include <CGAL/disable_warnings.h>
#include <cstdarg>
#include <cctype>
#include <vector>
@ -71,6 +73,8 @@
#include <CGAL/Polynomial_traits_d.h>
#include <CGAL/polynomial_utils.h>
#include <CGAL/enable_warnings.h>
#endif // CGAL_POLYNOMIAL_H
// EOF

View File

@ -1416,7 +1416,7 @@ namespace internal {
inline static void swallow(std::istream &is, char d) {
char c;
do c = is.get(); while (isspace(c));
do is.get(c); while (isspace(c));
if (c != d) CGAL_error_msg( "input error: unexpected character in polynomial");
}
} // namespace internal
@ -1435,7 +1435,7 @@ Polynomial<NT> Polynomial<NT>::input_ascii(std::istream &is) {
internal::Creation_tag TAG;
Polynomial<NT> p(TAG, degr+1);
do c = is.get(); while (isspace(c));
do is.get(c); while (isspace(c));
do {
if (c != '(') CGAL_error_msg( "input error: ( expected");
is >> CGAL::iformat(i);
@ -1445,7 +1445,7 @@ Polynomial<NT> Polynomial<NT>::input_ascii(std::istream &is) {
internal::swallow(is, ',');
is >> CGAL::iformat(p.coeff(i));
internal::swallow(is, ')');
do c = is.get(); while (isspace(c));
do is.get(c); while (isspace(c));
} while (c != ']');
p.reduce();

View File

@ -24,6 +24,8 @@
#ifndef CGAL_POLYNOMIAL_TRAITS_D_H
#define CGAL_POLYNOMIAL_TRAITS_D_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <functional>
#include <list>
@ -1714,4 +1716,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_POLYNOMIAL_TRAITS_D_H

View File

@ -25,6 +25,8 @@
#ifndef CGAL_POLYNOMIAL_TYPE_GENERATOR_H
#define CGAL_POLYNOMIAL_TYPE_GENERATOR_H
#include <CGAL/disable_warnings.h>
#include <CGAL/Polynomial_traits_d.h>
namespace CGAL {
@ -43,4 +45,6 @@ struct Polynomial_type_generator<T,0>{ typedef T Type; };
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_POLYNOMIAL_GENERATOR_H

View File

@ -125,7 +125,7 @@ public:
Arr_parameter_space ps_x, Arr_parameter_space ps_y)
{
m_point = point;
m_type = type;
m_type = static_cast<char>(type);
m_ps_x = static_cast<char>(ps_x);
m_ps_y = static_cast<char>(ps_y);
m_closed = 1;
@ -136,9 +136,9 @@ public:
Arr_parameter_space ps_x,
Arr_parameter_space ps_y)
{
m_type = type;
m_ps_x = ps_x;
m_ps_y = ps_y;
m_type = static_cast<char>(type);
m_ps_x = static_cast<char>(ps_x);
m_ps_y = static_cast<char>(ps_y);
m_closed = 0;
}