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

Fix CORE header-only

This commit is contained in:
Laurent Rineau 2016-03-09 18:51:34 +01:00
parent dd8d66ef96
commit 68df272c01
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CGAL_Core/include/CGAL/CORE/CoreAux.h
View File

@ -62,7 +62,7 @@ namespace CORE {
const double relEps = (1.0 + std::ldexp(1.0, -52)); const double relEps = (1.0 + std::ldexp(1.0, -52));
/// CORE_DIAGFILE is used for all warning and error messages /// CORE_DIAGFILE is used for all warning and error messages
extern const char* CORE_DIAGFILE; const char* const CORE_DIAGFILE = "Core_Diagnostics"; // global file name
/// template function returns the maximum value of two /// template function returns the maximum value of two
template <class T> template <class T>

3
CGAL_Core/include/CGAL/CORE/CoreAux_impl.h
View File

@ -194,9 +194,6 @@ int IntExponent(double d) {
return e-53; return e-53;
} }
/// CORE_DIAGFILE is file name for core_error(..) output.
const char* CORE_DIAGFILE = "Core_Diagnostics"; // global file name
/// core_error is the method to write Core Library warning or error messages /// core_error is the method to write Core Library warning or error messages
/** Both warnings and errors are written to a file called CORE_DIAGFILE. /** Both warnings and errors are written to a file called CORE_DIAGFILE.
* But errors are also written on std:cerr (similar to std::perror()). * But errors are also written on std:cerr (similar to std::perror()).

10
CGAL_Core/include/CGAL/CORE/Impl.h
View File

@ -40,6 +40,12 @@
#define CORE_INLINE #define CORE_INLINE
#endif #endif
#ifdef CGAL_HEADER_ONLY
#define CGAL_INLINE_FUNCTION inline
#else
#define CGAL_INLINE_FUNCTION
#endif
// Macros for memory pool // Macros for memory pool
#ifdef CORE_DISABLE_MEMORY_POOL #ifdef CORE_DISABLE_MEMORY_POOL
#define CORE_NEW(T) #define CORE_NEW(T)
@ -51,9 +57,9 @@
#define CORE_DELETE(T) void operator delete( void *p, size_t ); #define CORE_DELETE(T) void operator delete( void *p, size_t );
#define CORE_MEMORY_IMPL(T) \ #define CORE_MEMORY_IMPL(T) \
void *T::operator new( size_t size) \ CGAL_INLINE_FUNCTION void *T::operator new( size_t size) \
{ return MemoryPool<T>::global_allocator().allocate(size); } \ { return MemoryPool<T>::global_allocator().allocate(size); } \
void T::operator delete( void *p, size_t ) \ CGAL_INLINE_FUNCTION void T::operator delete( void *p, size_t ) \
{ MemoryPool<T>::global_allocator().free(p); } { MemoryPool<T>::global_allocator().free(p); }
#endif #endif