Skip to content
Snippets Groups Projects
Commit 392979fe authored by Chandler Robert Baker's avatar Chandler Robert Baker
Browse files

Merge branch 'stdenableif' into '23.0'

Use std::enable_if instead of boost::enable_if

See merge request atlas/athena!64188
parents 85229400 1cbd5e19
No related branches found
No related tags found
No related merge requests found
......@@ -31,9 +31,7 @@
#ifndef ROOTUTILS_PYROOTITERATORFUNCS_H
#define ROOTUTILS_PYROOTITERATORFUNCS_H
#include "boost/utility/enable_if.hpp"
#include "boost/type_traits/is_base_of.hpp"
#include <type_traits>
#include <iterator>
......@@ -53,9 +51,10 @@ public:
/// Ordering comparison. Only supported by random access iterators.
static typename boost::enable_if<
boost::is_base_of<std::random_access_iterator_tag,
static typename std::enable_if<
std::is_base_of_v<std::random_access_iterator_tag,
typename std::iterator_traits<T>::iterator_category>,
bool>::type
lt (T a, T b) { return a < b; }
};
......
......@@ -22,7 +22,7 @@
#include <string>
#include <set>
#include "boost/type_traits/is_same.hpp"
#include <type_traits>
#include "boost/shared_ptr.hpp"
#include "boost/lexical_cast.hpp"
......@@ -93,7 +93,7 @@ namespace Trig {
// is not substituded for DataVectors
template<class T>
const typename boost::disable_if_c<isDataVector<T>::value, T>::type*
const typename std::enable_if<!isDataVector<T>::value, T>::type*
use_or_construct(const T* source, const HLT::TriggerElement*, const std::string&, unsigned int, const HLT::NavigationCore* ) {
return source;
}
......@@ -101,7 +101,7 @@ namespace Trig {
// is substituded for DataVectors
template<class T>
const typename
boost::enable_if_c<isDataVector<T>::value, T>::type*
std::enable_if<isDataVector<T>::value, T>::type*
use_or_construct(const T* source, const HLT::TriggerElement* te, const std::string& label, unsigned int condition, const HLT::NavigationCore* navigation ) {
const TrigPassBits* bits(0);
......@@ -344,7 +344,7 @@ namespace Trig {
// access by container, stored as container
template<class CONT> TrigPassFlags
build_flags (const typename boost::enable_if_c<isDataVector<CONT>::value, CONT>::type *orig_cont, const CONT* cont, const TrigPassFlags * orig_tpf) {
build_flags (const typename std::enable_if<isDataVector<CONT>::value, CONT>::type *orig_cont, const CONT* cont, const TrigPassFlags * orig_tpf) {
TrigPassFlags tpf(cont->size(), orig_tpf->flagSize());
if(orig_cont->size() != orig_tpf->size()) {
......@@ -370,7 +370,7 @@ namespace Trig {
template<class T> TrigPassFlags
build_flags (const typename boost::disable_if_c<isDataVector<T>::value, T>::type *orig, const T* feature, const TrigPassFlags * orig_tpf) {
build_flags (const typename std::enable_if<!isDataVector<T>::value, T>::type *orig, const T* feature, const TrigPassFlags * orig_tpf) {
if(orig != feature) return TrigPassFlags(); // a problem TODO: print a ERROR
TrigPassFlags tpf(1, orig_tpf->flagSize());
......
......@@ -11,7 +11,6 @@
#include <iostream>
#include <algorithm>
#include <boost/mpl/if.hpp>
#include <boost/utility/enable_if.hpp>
#include "TrigNavigation/Holder.h"
#include "TrigNavigation/Holder.icc"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment