From 2fdc8227c5a13a866be61e8a998517f2e3f4ca75 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Mon, 22 Oct 2001 12:50:23 +0000 Subject: [PATCH] - Remove kludge for SunPro. - Remove useless CGAL_ALLOC macro. - Don't #include when we use LEDA. --- Old_Packages/Kernel_basic/include/CGAL/memory.h | 12 ++++-------- Packages/Kernel_23/include/CGAL/memory.h | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Old_Packages/Kernel_basic/include/CGAL/memory.h b/Old_Packages/Kernel_basic/include/CGAL/memory.h index b63593cfb93..8e7c04720bf 100644 --- a/Old_Packages/Kernel_basic/include/CGAL/memory.h +++ b/Old_Packages/Kernel_basic/include/CGAL/memory.h @@ -17,26 +17,22 @@ // revision_date : $Date$ // author(s) : Michael Seel // -// coordinator : MPI, Saarbruecken () +// coordinator : MPI, Saarbruecken // ====================================================================== #ifndef CGAL_MEMORY_H #define CGAL_MEMORY_H -#include +// This file defines the macro CGAL_ALLOCATOR(t) which is the default +// allocator used by CGAL. #ifdef CGAL_USE_LEDA # include # define CGAL_ALLOCATOR(t) leda_allocator< t > -# define CGAL_ALLOC leda_allocator - -#elif defined __SUNPRO_CC -# define CGAL_ALLOCATOR(t) std::allocator_interface< std::allocator< t >, t > -# define CGAL_ALLOC not_possible #else +# include # define CGAL_ALLOCATOR(t) std::allocator< t > -# define CGAL_ALLOC std::allocator #endif #endif // CGAL_MEMORY_H diff --git a/Packages/Kernel_23/include/CGAL/memory.h b/Packages/Kernel_23/include/CGAL/memory.h index b63593cfb93..8e7c04720bf 100644 --- a/Packages/Kernel_23/include/CGAL/memory.h +++ b/Packages/Kernel_23/include/CGAL/memory.h @@ -17,26 +17,22 @@ // revision_date : $Date$ // author(s) : Michael Seel // -// coordinator : MPI, Saarbruecken () +// coordinator : MPI, Saarbruecken // ====================================================================== #ifndef CGAL_MEMORY_H #define CGAL_MEMORY_H -#include +// This file defines the macro CGAL_ALLOCATOR(t) which is the default +// allocator used by CGAL. #ifdef CGAL_USE_LEDA # include # define CGAL_ALLOCATOR(t) leda_allocator< t > -# define CGAL_ALLOC leda_allocator - -#elif defined __SUNPRO_CC -# define CGAL_ALLOCATOR(t) std::allocator_interface< std::allocator< t >, t > -# define CGAL_ALLOC not_possible #else +# include # define CGAL_ALLOCATOR(t) std::allocator< t > -# define CGAL_ALLOC std::allocator #endif #endif // CGAL_MEMORY_H