[Rcpp-commits] r1183 - pkg/Rcpp/inst/include/Rcpp pkg/Rcpp/inst/include/Rcpp/preprocessor scripts

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri May 7 08:12:45 CEST 2010


Author: romain
Date: 2010-05-07 08:12:45 +0200 (Fri, 07 May 2010)
New Revision: 1183

Added:
   pkg/Rcpp/inst/include/Rcpp/preprocessor/
   pkg/Rcpp/inst/include/Rcpp/preprocessor/cat.hpp
   pkg/Rcpp/inst/include/Rcpp/preprocessor/config.hpp
Modified:
   pkg/Rcpp/inst/include/Rcpp/preprocessor.h
   pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h
   scripts/preprocessor.R
Log:
using RCPP_PP_CAT (borrowed from boost preprocessor library) instead of ## to delay evaluation

Added: pkg/Rcpp/inst/include/Rcpp/preprocessor/cat.hpp
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor/cat.hpp	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor/cat.hpp	2010-05-07 06:12:45 UTC (rev 1183)
@@ -0,0 +1,35 @@
+# /* Copyright (C) 2001
+#  * Housemarque Oy
+#  * http://www.housemarque.com
+#  *
+#  * Distributed under the Boost Software License, Version 1.0. (See
+#  * accompanying file LICENSE_1_0.txt or copy at
+#  * http://www.boost.org/LICENSE_1_0.txt)
+#  */
+#
+# /* Revised by Paul Mensonides (2002) */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef RCPP_PREPROCESSOR_CAT_HPP
+# define RCPP_PREPROCESSOR_CAT_HPP
+#
+# include <Rcpp/preprocessor/config.hpp>
+#
+# /* RCPP_PP_CAT */
+#
+# if ~RCPP_PP_CONFIG_FLAGS() & RCPP_PP_CONFIG_MWCC()
+#    define RCPP_PP_CAT(a, b) RCPP_PP_CAT_I(a, b)
+# else
+#    define RCPP_PP_CAT(a, b) RCPP_PP_CAT_OO((a, b))
+#    define RCPP_PP_CAT_OO(par) RCPP_PP_CAT_I ## par
+# endif
+#
+# if ~RCPP_PP_CONFIG_FLAGS() & RCPP_PP_CONFIG_MSVC()
+#    define RCPP_PP_CAT_I(a, b) a ## b
+# else
+#    define RCPP_PP_CAT_I(a, b) RCPP_PP_CAT_II(a ## b)
+#    define RCPP_PP_CAT_II(res) res
+# endif
+#
+# endif

Added: pkg/Rcpp/inst/include/Rcpp/preprocessor/config.hpp
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor/config.hpp	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor/config.hpp	2010-05-07 06:12:45 UTC (rev 1183)
@@ -0,0 +1,70 @@
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Paul Mensonides 2002.
+#  *     Distributed under the Boost Software License, Version 1.0. (See
+#  *     accompanying file LICENSE_1_0.txt or copy at
+#  *     http://www.boost.org/LICENSE_1_0.txt)
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef RCPP_PREPROCESSOR_CONFIG_CONFIG_HPP
+# define RCPP_PREPROCESSOR_CONFIG_CONFIG_HPP
+#
+# /* RCPP_PP_CONFIG_FLAGS */
+#
+# define RCPP_PP_CONFIG_STRICT() 0x0001
+# define RCPP_PP_CONFIG_IDEAL() 0x0002
+#
+# define RCPP_PP_CONFIG_MSVC() 0x0004
+# define RCPP_PP_CONFIG_MWCC() 0x0008
+# define RCPP_PP_CONFIG_BCC() 0x0010
+# define RCPP_PP_CONFIG_EDG() 0x0020
+# define RCPP_PP_CONFIG_DMC() 0x0040
+#
+# ifndef RCPP_PP_CONFIG_FLAGS
+#    if defined(__GCCXML__)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_STRICT())
+#    elif defined(__WAVE__)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_STRICT())
+#    elif defined(__MWERKS__) && __MWERKS__ >= 0x3200
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_STRICT())
+#    elif defined(__EDG__) || defined(__EDG_VERSION__)
+#        if defined(_MSC_VER) && __EDG_VERSION__ >= 308
+#            define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_MSVC())
+#        else
+#            define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_EDG() | RCPP_PP_CONFIG_STRICT())
+#        endif
+#    elif defined(__MWERKS__)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_MWCC())
+#    elif defined(__DMC__)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_DMC())
+#    elif defined(__BORLANDC__) && __BORLANDC__ >= 0x581
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_STRICT())
+#    elif defined(__BORLANDC__) || defined(__IBMC__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_BCC())
+#    elif defined(_MSC_VER)
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_MSVC())
+#    else
+#        define RCPP_PP_CONFIG_FLAGS() (RCPP_PP_CONFIG_STRICT())
+#    endif
+# endif
+#
+# /* RCPP_PP_CONFIG_EXTENDED_LINE_INFO */
+#
+# ifndef RCPP_PP_CONFIG_EXTENDED_LINE_INFO
+#    define RCPP_PP_CONFIG_EXTENDED_LINE_INFO 0
+# endif
+#
+# /* RCPP_PP_CONFIG_ERRORS */
+#
+# ifndef RCPP_PP_CONFIG_ERRORS
+#    ifdef NDEBUG
+#        define RCPP_PP_CONFIG_ERRORS 0
+#    else
+#        define RCPP_PP_CONFIG_ERRORS 1
+#    endif
+# endif
+#
+# endif

Modified: pkg/Rcpp/inst/include/Rcpp/preprocessor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-05-07 05:59:51 UTC (rev 1182)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-05-07 06:12:45 UTC (rev 1183)
@@ -123,4 +123,10 @@
 
 #define RCPP_REGISTER(__NAME__) 
 
+// from boost preprocessor library
+#include <Rcpp/preprocessor/cat.hpp>
+
+#define RCPP_CLASS_START <Rcpp/class_start.h>
+#define RCPP_CLASS_STOP <Rcpp/class_stop.h>
+
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h	2010-05-07 05:59:51 UTC (rev 1182)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor_generated.h	2010-05-07 06:12:45 UTC (rev 1183)
@@ -26,7 +26,8 @@
 
 
 #define RCPP_FUNCTION_0(__OUT__,__NAME__)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 0 ,                             \
@@ -48,7 +49,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)()
 
 #define RCPP_FUNCTION_1(__OUT__,__NAME__, ___0)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 1 ,                             \
@@ -70,7 +72,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0)
 
 #define RCPP_FUNCTION_2(__OUT__,__NAME__, ___0, ___1)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 2 ,                             \
@@ -92,7 +95,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1)
 
 #define RCPP_FUNCTION_3(__OUT__,__NAME__, ___0, ___1, ___2)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 3 ,                             \
@@ -114,7 +118,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2)
 
 #define RCPP_FUNCTION_4(__OUT__,__NAME__, ___0, ___1, ___2, ___3)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 4 ,                             \
@@ -136,7 +141,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3)
 
 #define RCPP_FUNCTION_5(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 5 ,                             \
@@ -158,7 +164,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4)
 
 #define RCPP_FUNCTION_6(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 6 ,                             \
@@ -180,7 +187,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5)
 
 #define RCPP_FUNCTION_7(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 7 ,                             \
@@ -202,7 +210,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6)
 
 #define RCPP_FUNCTION_8(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 8 ,                             \
@@ -224,7 +233,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7)
 
 #define RCPP_FUNCTION_9(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 9 ,                             \
@@ -246,7 +256,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8)
 
 #define RCPP_FUNCTION_10(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 10 ,                             \
@@ -268,7 +279,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9)
 
 #define RCPP_FUNCTION_11(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 11 ,                             \
@@ -290,7 +302,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10)
 
 #define RCPP_FUNCTION_12(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 12 ,                             \
@@ -312,7 +325,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11)
 
 #define RCPP_FUNCTION_13(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 13 ,                             \
@@ -334,7 +348,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12)
 
 #define RCPP_FUNCTION_14(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 14 ,                             \
@@ -356,7 +371,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13)
 
 #define RCPP_FUNCTION_15(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 15 ,                             \
@@ -378,7 +394,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14)
 
 #define RCPP_FUNCTION_16(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 16 ,                             \
@@ -400,7 +417,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15)
 
 #define RCPP_FUNCTION_17(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 17 ,                             \
@@ -422,7 +440,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16)
 
 #define RCPP_FUNCTION_18(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 18 ,                             \
@@ -444,7 +463,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17)
 
 #define RCPP_FUNCTION_19(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 19 ,                             \
@@ -466,7 +486,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18)
 
 #define RCPP_FUNCTION_20(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 20 ,                             \
@@ -488,7 +509,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19)
 
 #define RCPP_FUNCTION_21(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 21 ,                             \
@@ -510,7 +532,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20)
 
 #define RCPP_FUNCTION_22(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 22 ,                             \
@@ -532,7 +555,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21)
 
 #define RCPP_FUNCTION_23(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 23 ,                             \
@@ -554,7 +578,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22)
 
 #define RCPP_FUNCTION_24(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 24 ,                             \
@@ -576,7 +601,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23)
 
 #define RCPP_FUNCTION_25(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 25 ,                             \
@@ -598,7 +624,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24)
 
 #define RCPP_FUNCTION_26(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 26 ,                             \
@@ -620,7 +647,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25)
 
 #define RCPP_FUNCTION_27(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 27 ,                             \
@@ -642,7 +670,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26)
 
 #define RCPP_FUNCTION_28(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 28 ,                             \
@@ -664,7 +693,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27)
 
 #define RCPP_FUNCTION_29(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 29 ,                             \
@@ -686,7 +716,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28)
 
 #define RCPP_FUNCTION_30(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 30 ,                             \
@@ -708,7 +739,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29)
 
 #define RCPP_FUNCTION_31(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 31 ,                             \
@@ -730,7 +762,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30)
 
 #define RCPP_FUNCTION_32(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 32 ,                             \
@@ -752,7 +785,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31)
 
 #define RCPP_FUNCTION_33(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 33 ,                             \
@@ -774,7 +808,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32)
 
 #define RCPP_FUNCTION_34(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 34 ,                             \
@@ -796,7 +831,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33)
 
 #define RCPP_FUNCTION_35(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 35 ,                             \
@@ -818,7 +854,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34)
 
 #define RCPP_FUNCTION_36(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 36 ,                             \
@@ -840,7 +877,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35)
 
 #define RCPP_FUNCTION_37(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 37 ,                             \
@@ -862,7 +900,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36)
 
 #define RCPP_FUNCTION_38(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36, ___37)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 38 ,                             \
@@ -884,7 +923,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36, ___37)
 
 #define RCPP_FUNCTION_39(__OUT__,__NAME__, ___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36, ___37, ___38)        \
-extern "C" SEXP __NAME__##__rcpp_info__( ){         \
+RCPP_REGISTER(__NAME__)                             \
+extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)( ){         \
     using Rcpp::_ ;                                 \
 	Rcpp::List info = Rcpp::List::create(           \
         _["n"]   = 39 ,                             \
@@ -906,7 +946,8 @@
 __OUT__ RCPP_DECORATE(__NAME__)(___0, ___1, ___2, ___3, ___4, ___5, ___6, ___7, ___8, ___9, ___10, ___11, ___12, ___13, ___14, ___15, ___16, ___17, ___18, ___19, ___20, ___21, ___22, ___23, ___24, ___25, ___26, ___27, ___28, ___29, ___30, ___31, ___32, ___33, ___34, ___35, ___36, ___37, ___38)
 
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/rcpp -r 1183


More information about the Rcpp-commits mailing list