Skip to content

Commit 2d7c521

Browse files
committed
fix missing typedef
1 parent 8ba2d7b commit 2d7c521

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
#ifndef Rcpp__sugar__sapply_h
2323
#define Rcpp__sugar__sapply_h
2424

25-
// This used to be conditional on a define and test in compiler.h
26-
#include <type_traits> // ::std::result_of
27-
2825
namespace Rcpp{
2926
namespace sugar{
3027

inst/include/Rcpp/traits/result_of.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ struct result_of{
4040

4141
template <typename T>
4242
struct result_of<T>{
43-
typename T::result_type type ;
44-
} ;
45-
46-
template <typename RESULT_TYPE, typename... Args>
47-
struct result_of< RESULT_TYPE (*)(Args...) >{
48-
typedef RESULT_TYPE type ;
43+
typedef typename T::result_type type ;
4944
} ;
5045

5146
}

0 commit comments

Comments
 (0)