diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h index b2821710e58..0f0263f0677 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h @@ -376,7 +376,7 @@ public: SVertex* get_vertex_node( const SVertex& ) { SVertex* p = vertex_allocator.allocate(1); #ifdef CGAL_CXX11 - std::allocator_traits::construct(vertex_allocator, p, SVertex()); + std::allocator_traits::construct(vertex_allocator, p); #else vertex_allocator.construct( p, SVertex()); #endif @@ -384,7 +384,7 @@ public: } void put_vertex_node( SVertex* p) { #ifdef CGAL_CXX11 - std::allocator_traits::destroy(vertex_allocator, p); + std::allocator_traits::destroy(vertex_allocator, p); #else vertex_allocator.destroy(p); #endif @@ -395,7 +395,7 @@ public: SHalfedge* get_halfedge_node( const SHalfedge& ) { SHalfedge* p = halfedge_allocator.allocate(1); #ifdef CGAL_CXX11 - std::allocator_traits::construct(halfedge_allocator, p, SHalfedge()); + std::allocator_traits::construct(halfedge_allocator, p); #else halfedge_allocator.construct( p, SHalfedge()); #endif @@ -414,7 +414,7 @@ public: SFace* get_face_node( const SFace& ) { SFace* p = face_allocator.allocate(1); #ifdef CGAL_CXX11 - std::allocator_traits::construct(face_allocator, p, Vertex()); + std::allocator_traits::construct(face_allocator, p); #else face_allocator.construct( p, SFace()); #endif diff --git a/STL_Extension/include/CGAL/Concurrent_compact_container.h b/STL_Extension/include/CGAL/Concurrent_compact_container.h index 22bd96ceca6..9ec83487b16 100644 --- a/STL_Extension/include/CGAL/Concurrent_compact_container.h +++ b/STL_Extension/include/CGAL/Concurrent_compact_container.h @@ -404,8 +404,8 @@ public: { FreeList * fl = get_free_list(); pointer ret = init_insert(fl); - #ifdef CGAL_CXX11 - std::allocator_traits::construct(am_lloc, ret, t); +#ifdef CGAL_CXX11 + std::allocator_traits::construct(m_alloc, ret, t); #else m_alloc.construct(ret, t); #endif diff --git a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h index 1b903c92ebf..efac2e8109c 100644 --- a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h +++ b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h @@ -170,17 +170,15 @@ public: #ifdef CGAL_CXX11 typedef std::allocator_traits Allocator_traits; typedef typename Allocator_traits::template rebind_alloc Event_alloc; - - typedef std::allocator_traits Allocator_traits; typedef typename Allocator_traits::template rebind_alloc Subcurve_alloc; -#else +#else // not CGAL_CXX11 typedef typename Allocator::template rebind Event_alloc_rebind; typedef typename Event_alloc_rebind::other Event_alloc; typedef typename Allocator::template rebind Subcurve_alloc_rebind; typedef typename Subcurve_alloc_rebind::other Subcurve_alloc; -#endif - +#endif // not CGAL_CXX11 + protected: /*! \struct * An auxiliary functor for comparing event pointers.