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

removed leading underscores from memory interface

This commit is contained in:
Luis Peñaranda 2013-09-19 16:08:40 -03:00
parent 615fdb7905
commit 44117e0ae2
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Algebraic_kernel_d/include/CGAL/RS/memory.h
View File

@ -59,43 +59,43 @@ inline void rs3_rs_gmp_free(void * p,size_t s) {}
#endif // CGAL_USE_OLD_RS3
//--------------------------------------------------
// extern void * (*__cgalrs_allocate_func) (size_t);
// extern void * (*__cgalrs_reallocate_func) (void *, size_t, size_t);
// extern void (*__cgalrs_free_func) (void *, size_t);
// extern void * (*cgalrs_allocate_func) (size_t);
// extern void * (*cgalrs_reallocate_func) (void *, size_t, size_t);
// extern void (*cgalrs_free_func) (void *, size_t);
//--------------------------------------------------
inline void* __cgalrs_default_allocate(size_t s){
inline void* cgalrs_default_allocate(size_t s){
return malloc(s);
}
inline void* __cgalrs_default_reallocate(void *a,size_t o,size_t n){
inline void* cgalrs_default_reallocate(void *a,size_t o,size_t n){
return realloc(a,n);
}
inline void __cgalrs_default_free(void *a,size_t s){
inline void cgalrs_default_free(void *a,size_t s){
return free(a);
}
CGALRS_THREAD_ATTR void * (*__cgalrs_allocate_func) (size_t) =
__cgalrs_default_allocate;
CGALRS_THREAD_ATTR void * (*cgalrs_allocate_func) (size_t) =
cgalrs_default_allocate;
CGALRS_THREAD_ATTR void * (*__cgalrs_reallocate_func) (void *, size_t, size_t) =
__cgalrs_default_reallocate;
CGALRS_THREAD_ATTR void * (*cgalrs_reallocate_func) (void *, size_t, size_t) =
cgalrs_default_reallocate;
CGALRS_THREAD_ATTR void (*__cgalrs_free_func) (void *, size_t) =
__cgalrs_default_free;
CGALRS_THREAD_ATTR void (*cgalrs_free_func) (void *, size_t) =
cgalrs_default_free;
inline void __cgalrs_dummy_free(void *p,size_t s){}
inline void cgalrs_dummy_free(void *p,size_t s){}
inline void cgalrs_set_memory_functions(
void *(*alloc_func) (size_t),
void *(*realloc_func) (void *, size_t, size_t),
void (*free_func) (void *, size_t)){
__cgalrs_allocate_func=
alloc_func?alloc_func:__cgalrs_default_allocate;
__cgalrs_reallocate_func=
realloc_func?realloc_func:__cgalrs_default_reallocate;
__cgalrs_free_func=
free_func?free_func:__cgalrs_default_free;
cgalrs_allocate_func=
alloc_func?alloc_func:cgalrs_default_allocate;
cgalrs_reallocate_func=
realloc_func?realloc_func:cgalrs_default_reallocate;
cgalrs_free_func=
free_func?free_func:cgalrs_default_free;
}
inline void cgalrs_get_memory_functions(
@ -103,11 +103,11 @@ inline void cgalrs_get_memory_functions(
void *(**realloc_func) (void *, size_t, size_t),
void (**free_func) (void *, size_t)){
if(alloc_func!=NULL)
*alloc_func=__cgalrs_allocate_func;
*alloc_func=cgalrs_allocate_func;
if(realloc_func!=NULL)
*realloc_func=__cgalrs_reallocate_func;
*realloc_func=cgalrs_reallocate_func;
if(free_func!=NULL)
*free_func=__cgalrs_free_func;
*free_func=cgalrs_free_func;
}
} // namespace CGAL

3
Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h
View File

@ -21,6 +21,7 @@
#include <CGAL/Polynomial.h>
#include <CGAL/RS/polynomial_1.h>
#include <CGAL/RS/memory.h>
namespace CGAL{
@ -58,7 +59,7 @@ public std::unary_function<RS_polynomial_1,RS_polynomial_1>{
for(int i=0;i<=d;++i) \
_CONVERT; \
mp_get_memory_functions(&af,&rf,&ff); \
mp_set_memory_functions(af,rf,__cgalrs_dummy_free); \
mp_set_memory_functions(af,rf,cgalrs_dummy_free); \
RS_polynomial_1 *r=new RS_polynomial_1(&c,d); \
mp_set_memory_functions(af,rf,ff); \
return *r; \