Skip to content

Commit 475ec62

Browse files
committed
[DF] Use enable_if_t alias wherever possible, for readability
1 parent 2454a1a commit 475ec62

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

tree/dataframe/inc/ROOT/RDF/ActionHelpers.hxx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -392,28 +392,28 @@ class R__CLING_PTRCHECK(off) FillHelper : public RActionImpl<FillHelper<HIST>> {
392392
// in c++17 or later
393393

394394
// return unchanged value for scalar
395-
template <typename T, typename std::enable_if<!IsDataContainer<T>::value, int>::type = 0>
395+
template <typename T, std::enable_if_t<!IsDataContainer<T>::value, int> = 0>
396396
ScalarConstIterator<T> MakeBegin(const T &val)
397397
{
398398
return ScalarConstIterator<T>(&val);
399399
}
400400

401401
// return iterator to beginning of container
402-
template <typename T, typename std::enable_if<IsDataContainer<T>::value, int>::type = 0>
402+
template <typename T, std::enable_if_t<IsDataContainer<T>::value, int> = 0>
403403
auto MakeBegin(const T &val)
404404
{
405405
return std::begin(val);
406406
}
407407

408408
// return 1 for scalars
409-
template <typename T, typename std::enable_if<!IsDataContainer<T>::value, int>::type = 0>
409+
template <typename T, std::enable_if_t<!IsDataContainer<T>::value, int> = 0>
410410
std::size_t GetSize(const T &)
411411
{
412412
return 1;
413413
}
414414

415415
// return container size
416-
template <typename T, typename std::enable_if<IsDataContainer<T>::value, int>::type = 0>
416+
template <typename T, std::enable_if_t<IsDataContainer<T>::value, int> = 0>
417417
std::size_t GetSize(const T &val)
418418
{
419419
#if __cplusplus >= 201703L
@@ -452,15 +452,14 @@ public:
452452
void InitTask(TTreeReader *, unsigned int) {}
453453

454454
// no container arguments
455-
template <typename... ValTypes,
456-
typename std::enable_if<!Disjunction<IsDataContainer<ValTypes>...>::value, int>::type = 0>
455+
template <typename... ValTypes, std::enable_if_t<!Disjunction<IsDataContainer<ValTypes>...>::value, int> = 0>
457456
void Exec(unsigned int slot, const ValTypes &...x)
458457
{
459458
fObjects[slot]->Fill(x...);
460459
}
461460

462461
// at least one container argument
463-
template <typename... Xs, typename std::enable_if<Disjunction<IsDataContainer<Xs>...>::value, int>::type = 0>
462+
template <typename... Xs, std::enable_if_t<Disjunction<IsDataContainer<Xs>...>::value, int> = 0>
464463
void Exec(unsigned int slot, const Xs &...xs)
465464
{
466465
// array of bools keeping track of which inputs are containers
@@ -509,14 +508,14 @@ public:
509508
}
510509

511510
// if the fObjects vector type is derived from TObject, return the name of the object
512-
template <typename T = HIST, typename std::enable_if<std::is_base_of<TObject, T>::value>::type * = nullptr>
511+
template <typename T = HIST, std::enable_if_t<std::is_base_of<TObject, T>::value, int> = 0>
513512
std::string GetActionName()
514513
{
515514
return std::string(fObjects[0]->IsA()->GetName()) + "<BR/>" + std::string(fObjects[0]->GetName());
516515
}
517516

518517
// if fObjects is not derived from TObject, indicate it is some other object
519-
template <typename T = HIST, typename std::enable_if<!std::is_base_of<TObject, T>::value>::type * = nullptr>
518+
template <typename T = HIST, std::enable_if_t<!std::is_base_of<TObject, T>::value, int> = 0>
520519
std::string GetActionName()
521520
{
522521
return "Fill custom object";

0 commit comments

Comments
 (0)