mirror of https://github.com/CGAL/cgal
completely disable boost pool allocator
some regressions are observed in multithreaded env
This commit is contained in:
parent
775312074e
commit
3d4ca1ae4e
|
|
@ -34,8 +34,6 @@
|
||||||
#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 {
|
||||||
|
|
||||||
inline void* _clean_pointer(const void* p)
|
inline void* _clean_pointer(const void* p)
|
||||||
|
|
@ -964,7 +962,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 = boost::fast_pool_allocator<int> >
|
class Allocator = CGAL_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.
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,6 @@
|
||||||
#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
|
||||||
|
|
@ -66,7 +64,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 boost::fast_pool_allocator<int> Allocator;
|
typedef CGAL_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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue