|
1 | 1 | /* |
2 | | - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. |
| 2 | + * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved. |
3 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 | 4 | * |
5 | 5 | * This code is free software; you can redistribute it and/or modify it |
|
27 | 27 |
|
28 | 28 | #include "memory/allocation.hpp" |
29 | 29 | #include "metaprogramming/enableIf.hpp" |
30 | | -#include "metaprogramming/logical.hpp" |
31 | 30 | #include "runtime/mutex.hpp" |
32 | 31 | #include "utilities/debug.hpp" |
33 | 32 | #include "utilities/globalDefinitions.hpp" |
34 | 33 |
|
| 34 | +#include <type_traits> |
| 35 | + |
35 | 36 | // A class that acts as a synchronisation barrier. Workers enter |
36 | 37 | // the barrier and must wait until all other workers have entered |
37 | 38 | // before any of them may leave. |
@@ -103,7 +104,7 @@ class SubTasksDone: public CHeapObj<mtInternal> { |
103 | 104 | // explicitly passed as extra arguments. Every thread in the parallel task |
104 | 105 | // must execute this. |
105 | 106 | template<typename T0, typename... Ts, |
106 | | - ENABLE_IF(Conjunction<std::is_same<T0, Ts>...>::value)> |
| 107 | + ENABLE_IF(std::conjunction_v<std::is_same<T0, Ts>...>)> |
107 | 108 | void all_tasks_claimed(T0 first_skipped, Ts... more_skipped) { |
108 | 109 | static_assert(std::is_convertible<T0, uint>::value, "not convertible"); |
109 | 110 | uint skipped[] = { static_cast<uint>(first_skipped), static_cast<uint>(more_skipped)... }; |
|
0 commit comments