Skip to content

Commit 08d1d3e

Browse files
committed
Update sapply.h
1 parent 4e86908 commit 08d1d3e

File tree

1 file changed

+3
-9
lines changed
  • inst/include/Rcpp/sugar/functions

1 file changed

+3
-9
lines changed

inst/include/Rcpp/sugar/functions/sapply.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@
2222
#ifndef Rcpp__sugar__sapply_h
2323
#define Rcpp__sugar__sapply_h
2424

25-
#if (__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X__)
26-
#define RCPP_USE_CXX11 1
27-
#else
28-
#define RCPP_USE_CXX11 0
29-
#endif
30-
31-
#if RCPP_USE_CXX11
32-
#include <type_traits>
25+
#if defined(RCPP_USING_CXX0X_OR_LATER)
26+
#include <type_traits> // ::std::result_of
3327
#endif
3428

3529
namespace Rcpp{
@@ -38,7 +32,7 @@ namespace sugar{
3832
template <typename Function, typename SugarExpression>
3933
struct sapply_application_result_of
4034
{
41-
#if RCPP_USE_CXX11
35+
#if defined(RCPP_USING_CXX0X_OR_LATER)
4236
typedef typename ::std::result_of<Function(typename SugarExpression::stored_type)>::type type;
4337
#else
4438
typedef typename ::Rcpp::traits::result_of<Function>::type type;

0 commit comments

Comments
 (0)