From 1f91465c32fc0121e59a57b2183e7eb4b79c23f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= Date: Thu, 19 Sep 2013 16:22:55 -0300 Subject: [PATCH] removed leading _ from polynomial converter --- .../include/CGAL/RS/polynomial_converter.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h index 5f60a50b36a..e256e57fd6a 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h +++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_converter.h @@ -46,18 +46,18 @@ public std::unary_function{ // The conversions using this macro are efficient, since this construct an // RS polynomial only by copying pointers. The only implementation detail // is that it should not free the occuped by the pointed coefficients. -#define CGALRS_POLYNOMIAL_CONVERTER_REF(_T,_CONVERT) \ +#define CGALRS_POLYNOMIAL_CONVERTER_REF(TYPE,CONVERT_FUNCTION) \ template<> \ - struct to_rs_poly >: \ - public std::unary_function,RS_polynomial_1>{ \ - RS_polynomial_1& operator()(const Polynomial<_T> &p)const{ \ + struct to_rs_poly >: \ + public std::unary_function,RS_polynomial_1>{ \ + RS_polynomial_1& operator()(const Polynomial &p)const{ \ void *(*af)(size_t); \ void *(*rf)(void*,size_t,size_t); \ void (*ff)(void*,size_t); \ int d=p.degree(); \ mpz_t* c=(mpz_t*)malloc((d+1)*sizeof(mpz_t)); \ for(int i=0;i<=d;++i) \ - _CONVERT; \ + CONVERT_FUNCTION; \ mp_get_memory_functions(&af,&rf,&ff); \ mp_set_memory_functions(af,rf,cgalrs_dummy_free); \ RS_polynomial_1 *r=new RS_polynomial_1(&c,d); \ @@ -69,16 +69,16 @@ public std::unary_function{ // The conversions using this macro are not intended to be efficient, since // there is no direct way to convert from these types to mpz_t and we need // thus to create new mpz_t's. -#define CGALRS_POLYNOMIAL_CONVERTER_COPY(_T,_CONVERT) \ +#define CGALRS_POLYNOMIAL_CONVERTER_COPY(TYPE,CONVERT_FUNCTION) \ template<> \ - struct to_rs_poly >: \ - public std::unary_function,RS_polynomial_1>{ \ - RS_polynomial_1& operator()(const Polynomial<_T> &p)const{ \ + struct to_rs_poly >: \ + public std::unary_function,RS_polynomial_1>{ \ + RS_polynomial_1& operator()(const Polynomial &p)const{ \ int d=p.degree(); \ mpz_t* c=(mpz_t*)malloc((d+1)*sizeof(mpz_t)); \ for(int i=0;i<=d;++i){ \ mpz_init(c[i]); \ - _CONVERT; \ + CONVERT_FUNCTION; \ } \ return *(new RS_polynomial_1(&c,d)); \ } \