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

Fix compilation errors

This commit is contained in:
Laurent Rineau 2018-04-17 16:42:59 +02:00
parent 095c27e2be
commit 33d3abaf26
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Nef_S2/include/CGAL/Nef_S2/Sphere_map.h
View File

@ -376,7 +376,7 @@ public:
SVertex* get_vertex_node( const SVertex& ) { SVertex* get_vertex_node( const SVertex& ) {
SVertex* p = vertex_allocator.allocate(1); SVertex* p = vertex_allocator.allocate(1);
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
std::allocator_traits<SVertex_alloc>::construct(vertex_allocator, p, SVertex()); std::allocator_traits<SVertex_alloc>::construct(vertex_allocator, p);
#else #else
vertex_allocator.construct( p, SVertex()); vertex_allocator.construct( p, SVertex());
#endif #endif
@ -384,7 +384,7 @@ public:
} }
void put_vertex_node( SVertex* p) { void put_vertex_node( SVertex* p) {
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
std::allocator_traits<Vertex_alloc>::destroy(vertex_allocator, p); std::allocator_traits<SVertex_alloc>::destroy(vertex_allocator, p);
#else #else
vertex_allocator.destroy(p); vertex_allocator.destroy(p);
#endif #endif
@ -395,7 +395,7 @@ public:
SHalfedge* get_halfedge_node( const SHalfedge& ) { SHalfedge* get_halfedge_node( const SHalfedge& ) {
SHalfedge* p = halfedge_allocator.allocate(1); SHalfedge* p = halfedge_allocator.allocate(1);
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
std::allocator_traits<Shalfedge_alloc>::construct(halfedge_allocator, p, SHalfedge()); std::allocator_traits<SHalfedge_alloc>::construct(halfedge_allocator, p);
#else #else
halfedge_allocator.construct( p, SHalfedge()); halfedge_allocator.construct( p, SHalfedge());
#endif #endif
@ -414,7 +414,7 @@ public:
SFace* get_face_node( const SFace& ) { SFace* get_face_node( const SFace& ) {
SFace* p = face_allocator.allocate(1); SFace* p = face_allocator.allocate(1);
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
std::allocator_traits<SFace_alloc>::construct(face_allocator, p, Vertex()); std::allocator_traits<SFace_alloc>::construct(face_allocator, p);
#else #else
face_allocator.construct( p, SFace()); face_allocator.construct( p, SFace());
#endif #endif

4
STL_Extension/include/CGAL/Concurrent_compact_container.h
View File

@ -404,8 +404,8 @@ public:
{ {
FreeList * fl = get_free_list(); FreeList * fl = get_free_list();
pointer ret = init_insert(fl); pointer ret = init_insert(fl);
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
std::allocator_traits<allocator_type>::construct(am_lloc, ret, t); std::allocator_traits<allocator_type>::construct(m_alloc, ret, t);
#else #else
m_alloc.construct(ret, t); m_alloc.construct(ret, t);
#endif #endif

6
Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h
View File

@ -170,16 +170,14 @@ public:
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
typedef std::allocator_traits<Allocator> Allocator_traits; typedef std::allocator_traits<Allocator> Allocator_traits;
typedef typename Allocator_traits::template rebind_alloc<Event> Event_alloc; typedef typename Allocator_traits::template rebind_alloc<Event> Event_alloc;
typedef std::allocator_traits<Allocator> Allocator_traits;
typedef typename Allocator_traits::template rebind_alloc<Subcurve> Subcurve_alloc; typedef typename Allocator_traits::template rebind_alloc<Subcurve> Subcurve_alloc;
#else #else // not CGAL_CXX11
typedef typename Allocator::template rebind<Event> Event_alloc_rebind; typedef typename Allocator::template rebind<Event> Event_alloc_rebind;
typedef typename Event_alloc_rebind::other Event_alloc; typedef typename Event_alloc_rebind::other Event_alloc;
typedef typename Allocator::template rebind<Subcurve> Subcurve_alloc_rebind; typedef typename Allocator::template rebind<Subcurve> Subcurve_alloc_rebind;
typedef typename Subcurve_alloc_rebind::other Subcurve_alloc; typedef typename Subcurve_alloc_rebind::other Subcurve_alloc;
#endif #endif // not CGAL_CXX11
protected: protected:
/*! \struct /*! \struct