[Rcpp-commits] r1984 - pkg/Rcpp/inst/include/Rcpp/sugar/functions

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-08-12 06:51:09 +0200 (Thu, 12 Aug 2010)
New Revision: 1984

Modified:
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/math.h
Log:
using SUGAR_MATH instead of SUGAR_BLOCK

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/functions/math.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/functions/math.h	2010-08-12 04:49:40 UTC (rev 1983)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/functions/math.h	2010-08-12 04:51:09 UTC (rev 1984)
@@ -22,15 +22,28 @@
 #ifndef RCPP_SUGAR_MATH_H
 #define RCPP_SUGAR_MATH_H
 
-SUGAR_BLOCK_1(gamma      , ::Rf_gammafn     )
-SUGAR_BLOCK_1(lgamma     , ::Rf_lgammafn    )
-SUGAR_BLOCK_1(digamma    , ::Rf_digamma     )
-SUGAR_BLOCK_1(trigamma   , ::Rf_trigamma    )
-SUGAR_BLOCK_1(tetragamma , ::Rf_tetragamma  )
-SUGAR_BLOCK_1(pentagamma , ::Rf_pentagamma  )
-SUGAR_BLOCK_1(expm1      , ::expm1          )
-SUGAR_BLOCK_1(log1p      , ::log1p          )
+SUGAR_MATH_1(acos,::acos)
+SUGAR_MATH_1(asin,::asin)
+SUGAR_MATH_1(atan,::atan)
+SUGAR_MATH_1(cos,::cos)
+SUGAR_MATH_1(cosh,::cosh)
+SUGAR_MATH_1(log,::log)
+SUGAR_MATH_1(log10,::log10)
+SUGAR_MATH_1(sqrt,::sqrt)
+SUGAR_MATH_1(sin,::sin)
+SUGAR_MATH_1(sinh,::sinh)
+SUGAR_MATH_1(tan,::tan)
+SUGAR_MATH_1(tanh,::tanh)
 
+SUGAR_MATH_1(gamma      , ::Rf_gammafn     )
+SUGAR_MATH_1(lgamma     , ::Rf_lgammafn    )
+SUGAR_MATH_1(digamma    , ::Rf_digamma     )
+SUGAR_MATH_1(trigamma   , ::Rf_trigamma    )
+SUGAR_MATH_1(tetragamma , ::Rf_tetragamma  )
+SUGAR_MATH_1(pentagamma , ::Rf_pentagamma  )
+SUGAR_MATH_1(expm1      , ::expm1          )
+SUGAR_MATH_1(log1p      , ::log1p          )
+
 namespace Rcpp{
 namespace internal{
 
@@ -43,29 +56,17 @@
 
 }
 }
-SUGAR_BLOCK_1(factorial  , ::Rcpp::internal::factorial   )
-SUGAR_BLOCK_1(lfactorial , ::Rcpp::internal::lfactorial  )
+SUGAR_MATH_1(factorial  , ::Rcpp::internal::factorial   )
+SUGAR_MATH_1(lfactorial , ::Rcpp::internal::lfactorial  )
 
-SUGAR_MATH_1(acos,::acos)
-SUGAR_MATH_1(asin,::asin)
-SUGAR_MATH_1(atan,::atan)
-SUGAR_MATH_1(cos,::cos)
-SUGAR_MATH_1(cosh,::cosh)
-SUGAR_MATH_1(log,::log)
-SUGAR_MATH_1(log10,::log10)
-SUGAR_MATH_1(sqrt,::sqrt)
-SUGAR_MATH_1(sin,::sin)
-SUGAR_MATH_1(sinh,::sinh)
-SUGAR_MATH_1(tan,::tan)
-SUGAR_MATH_1(tanh,::tanh)
 
 
+
+
 SUGAR_BLOCK_2(choose      , ::Rf_choose     )
 SUGAR_BLOCK_2(lchoose     , ::Rf_lchoose    )
-
 SUGAR_BLOCK_2(beta      , ::Rf_beta     )
 SUGAR_BLOCK_2(lbeta     , ::Rf_lbeta    )
-
 SUGAR_BLOCK_2(psigamma     , ::Rf_psigamma    )
 
 #endif