diff --git a/core/thread/inc/ROOT/TExecutor.hxx b/core/thread/inc/ROOT/TExecutor.hxx index 6740c62cbb442..511fdfc9f4aaa 100644 --- a/core/thread/inc/ROOT/TExecutor.hxx +++ b/core/thread/inc/ROOT/TExecutor.hxx @@ -12,8 +12,8 @@ #ifndef ROOT_TExecutor #define ROOT_TExecutor -#include "TCollection.h" #include "ROOT/TSeq.hxx" +#include namespace ROOT { @@ -31,13 +31,9 @@ public: // //and a compile-time check that the argument list implements a front() method (all STL sequence containers have it) template> auto Map(F func, unsigned nTimes) -> std::vector::type>; - template> - auto Map(F func, T &args) -> std::vector < decltype(++(args.begin()), args.end(), func(args.front()))>; // /// \cond doxygen should ignore these methods template> auto Map(F func, ROOT::TSeq args) -> std::vector::type>; - template> - auto Map(F func, TCollection &args) -> std::vector::type>; template> auto Map(F func, std::initializer_list args) -> std::vector::type>; template> diff --git a/core/thread/inc/ROOT/TThreadExecutor.hxx b/core/thread/inc/ROOT/TThreadExecutor.hxx index dea168824ab37..f11f36dd2e3f8 100644 --- a/core/thread/inc/ROOT/TThreadExecutor.hxx +++ b/core/thread/inc/ROOT/TThreadExecutor.hxx @@ -66,7 +66,7 @@ private: template class ParallelReductionResolver{ public: - static inline T Reduce(TThreadExecutor *threadExecutor, const std::vector &objs, const std::function &redfunc){ + static inline T Reduce(TThreadExecutor *, const std::vector &objs, const std::function &redfunc){ return std::accumulate(objs.begin(), objs.end(), T{}, redfunc); } };