Skip to content

Commit 15e5660

Browse files
authored
Merge pull request #45772 from Dr15Jones/conceptsReturnArgumentTypes
Use C++ concepts in ReturnArgumentTypes
2 parents 8d0e1da + f1f370f commit 15e5660

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

FWCore/Framework/interface/es_impl/ReturnArgumentTypes.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,19 @@ namespace edm {
4646

4747
//////////
4848

49-
template <typename F, typename = void>
49+
template <typename F>
5050
struct ReturnArgumentTypes;
5151

5252
template <typename F>
53-
struct ReturnArgumentTypes<F, std::enable_if_t<std::is_class_v<F>>> {
53+
requires std::is_class_v<F>
54+
struct ReturnArgumentTypes<F> {
5455
using argument_type = typename ReturnArgumentTypesImpl<decltype(&F::operator())>::argument_type;
5556
using return_type = typename ReturnArgumentTypesImpl<decltype(&F::operator())>::return_type;
5657
};
5758

5859
template <typename F>
59-
struct ReturnArgumentTypes<F, std::enable_if_t<std::is_pointer_v<F>>> {
60+
requires std::is_pointer_v<F>
61+
struct ReturnArgumentTypes<F> {
6062
using argument_type = typename ReturnArgumentTypesImpl<F>::argument_type;
6163
using return_type = typename ReturnArgumentTypesImpl<F>::return_type;
6264
};

0 commit comments

Comments
 (0)