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

Merge pull request #4861 from sgiraudot/Arrangement_2-Small_enhancements-GF 

Arrangement 2: Small Enhancements
This commit is contained in:
Laurent Rineau 2020-09-11 15:07:50 +02:00
parent 113048faef 23a02ff441
commit 6cf203f5ca
3 changed files with 750 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h
View File

@ -34,6 +34,7 @@
#include <CGAL/Arrangement_2/Arrangement_2_iterators.h> #include <CGAL/Arrangement_2/Arrangement_2_iterators.h>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
#include <boost/pool/pool_alloc.hpp>
namespace CGAL { namespace CGAL {
@ -876,7 +877,7 @@ public:
* The arrangement DCEL class. * The arrangement DCEL class.
*/ */
template <class V, class H, class F, template <class V, class H, class F,
class Allocator = CGAL_ALLOCATOR(int) > class Allocator = boost::fast_pool_allocator<int> >
class Arr_dcel_base { class Arr_dcel_base {
public: public:
// Define the vertex, halfedge and face types. // Define the vertex, halfedge and face types.

1088
Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
View File

File diff suppressed because it is too large Load Diff

4
Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
View File

@ -46,6 +46,8 @@
#include <CGAL/Iterator_project.h> #include <CGAL/Iterator_project.h>
#include <CGAL/Iterator_transform.h> #include <CGAL/Iterator_transform.h>
#include <boost/pool/pool_alloc.hpp>
namespace CGAL { namespace CGAL {
/*! \class Arrangement_on_surface_2 /*! \class Arrangement_on_surface_2
@ -64,7 +66,7 @@ class Arrangement_on_surface_2 {
public: public:
typedef GeomTraits_ Geometry_traits_2; typedef GeomTraits_ Geometry_traits_2;
typedef TopTraits_ Topology_traits; typedef TopTraits_ Topology_traits;
typedef CGAL_ALLOCATOR(int) Allocator; typedef boost::fast_pool_allocator<int> Allocator;
// first define adaptor ... // first define adaptor ...
typedef Arr_traits_basic_adaptor_2<Geometry_traits_2> Traits_adaptor_2; typedef Arr_traits_basic_adaptor_2<Geometry_traits_2> Traits_adaptor_2;