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

cosmetic changes

This commit is contained in:
Laurent Rineau 2018-04-17 16:42:25 +02:00
parent 00ebc78c1d
commit 095c27e2be
21 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,7 +916,7 @@ protected:
typedef typename Allocator_traits::template rebind_alloc<Outer_ccb> Outer_ccb_allocator;
typedef typename Allocator_traits::template rebind_alloc<Inner_ccb> Inner_ccb_allocator;
typedef typename Allocator_traits::template rebind_alloc<Isolated_vertex> Iso_vert_allocator;
#else
#else // not CGAL_CXX11
// Vertex allocator.
typedef typename Allocator::template rebind<Vertex> Vertex_alloc_rebind;
typedef typename Vertex_alloc_rebind::other Vertex_allocator;
@ -941,7 +941,7 @@ protected:
typedef typename Allocator::template rebind<Isolated_vertex>
Iso_vert_alloc_rebind;
typedef typename Iso_vert_alloc_rebind::other Iso_vert_allocator;
#endif
#endif // not CGAL_CXX11
public:
typedef typename Halfedge_list::size_type Size;

5
Combinatorial_map/include/CGAL/Combinatorial_map_storages.h
View File

@ -67,10 +67,9 @@ namespace CGAL {
#ifdef CGAL_CXX11
typedef std::allocator_traits<Alloc_> Allocator_traits;
typedef typename Allocator_traits::template rebind_alloc<Dart> Dart_allocator;
#else
#else // not CGAL_CXX11
typedef typename Alloc_::template rebind<Dart>::other Dart_allocator;
#endif
#endif // not CGAL_CXX11
typedef Compact_container<Dart, Dart_allocator> Dart_container;
typedef typename Dart_container::iterator Dart_handle;

4
HalfedgeDS/include/CGAL/HalfedgeDS_list.h
View File

@ -121,7 +121,7 @@ public:
typedef typename Allocator_traits::template rebind_alloc<Vertex> Vertex_allocator;
typedef typename Allocator_traits::template rebind_alloc<Halfedge> Halfedge_allocator;
typedef typename Allocator_traits::template rebind_alloc<Face> Face_allocator;
#else
#else // CGAL_CXX11
typedef typename Allocator::template rebind< Vertex> Vertex_alloc_rebind;
typedef typename Vertex_alloc_rebind::other Vertex_allocator;
typedef typename Allocator::template rebind< Halfedge>
@ -129,7 +129,7 @@ public:
typedef typename Halfedge_alloc_rebind::other Halfedge_allocator;
typedef typename Allocator::template rebind< Face> Face_alloc_rebind;
typedef typename Face_alloc_rebind::other Face_allocator;
#endif
#endif // not CGAL_CXX11
typedef In_place_list<Vertex,false,Vertex_allocator> Vertex_list;
typedef typename Vertex_list::iterator Vertex_handle;

4
HalfedgeDS/include/CGAL/HalfedgeDS_vector.h
View File

@ -71,7 +71,7 @@ public:
typedef typename Allocator_traits::template rebind_alloc<Vertex> Vertex_allocator;
typedef typename Allocator_traits::template rebind_alloc<Halfedge> Halfedge_allocator;
typedef typename Allocator_traits::template rebind_alloc<Face> Face_allocator;
#else
#else // not CGAL_CXX11
typedef typename Allocator::template rebind< Vertex> Vertex_alloc_rebind;
typedef typename Vertex_alloc_rebind::other Vertex_allocator;
typedef typename Allocator::template rebind< Halfedge>
@ -79,7 +79,7 @@ public:
typedef typename Halfedge_alloc_rebind::other Halfedge_allocator;
typedef typename Allocator::template rebind< Face> Face_alloc_rebind;
typedef typename Face_alloc_rebind::other Face_allocator;
#endif
#endif // not CGAL_CXX11
#ifdef CGAL__HALFEDGEDS_USE_INTERNAL_VECTOR
typedef internal::vector<Vertex, Vertex_allocator> Vertex_vector;

2
STL_Extension/include/CGAL/In_place_list.h
View File

@ -300,7 +300,7 @@ protected:
# else
allocator.destroy( p);
# endif
#else
#else // not CGAL_USE_ALLOCATOR_CONSTRUCT_DESTROY
p->~value_type();
#endif
allocator.deallocate( p, 1);