remove RCPP_USE_STD_FUNCTION again, instead use the autodetected RCPP_USING_CXX11

cauthmann · cauthmann · commit 4e2a6b4b5369 · 2014-08-11T10:28:47.000+02:00
diff --git a/inst/include/Rcpp/InternalFunction.h b/inst/include/Rcpp/InternalFunction.h
@@ -26,7 +26,7 @@
 
 #include <Rcpp/grow.h>
 
-#ifdef RCPP_USE_STD_FUNCTION
+#ifdef RCPP_USING_CXX11
 #include <Rcpp/InternalFunctionWithStdFunction.h>
 #endif
 
@@ -37,7 +37,7 @@ namespace Rcpp{
 
         RCPP_GENERATE_CTOR_ASSIGN(InternalFunction_Impl)
 
-#ifdef RCPP_USE_STD_FUNCTION
+#ifdef RCPP_USING_CXX11
     	template <typename RESULT_TYPE, typename... Args>
         InternalFunction_Impl(const std::function<RESULT_TYPE(Args...)> &fun) {
         	set(
diff --git a/inst/unitTests/cpp/InternalFunctionCPP11.cpp b/inst/unitTests/cpp/InternalFunctionCPP11.cpp
@@ -20,7 +20,6 @@
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#define RCPP_USE_STD_FUNCTION
 #include <Rcpp.h>
 
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.`
`21`	`21`
`22`	`22`
`23`		`-#define RCPP_USE_STD_FUNCTION`
`24`	`23`	`#include <Rcpp.h>`
`25`	`24`
`26`	`25`