Skip to content

Commit 394eb80

Browse files
author
Kim Barrett
committed
8368957: Remove metaprogramming/logical.hpp in favor of C++17 facilities
Reviewed-by: mchevalier, iwalulya
1 parent 8c3ca02 commit 394eb80

File tree

3 files changed

+4
-157
lines changed

3 files changed

+4
-157
lines changed

src/hotspot/share/gc/shared/workerUtils.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
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.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,12 @@
2727

2828
#include "memory/allocation.hpp"
2929
#include "metaprogramming/enableIf.hpp"
30-
#include "metaprogramming/logical.hpp"
3130
#include "runtime/mutex.hpp"
3231
#include "utilities/debug.hpp"
3332
#include "utilities/globalDefinitions.hpp"
3433

34+
#include <type_traits>
35+
3536
// A class that acts as a synchronisation barrier. Workers enter
3637
// the barrier and must wait until all other workers have entered
3738
// before any of them may leave.
@@ -103,7 +104,7 @@ class SubTasksDone: public CHeapObj<mtInternal> {
103104
// explicitly passed as extra arguments. Every thread in the parallel task
104105
// must execute this.
105106
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>...>)>
107108
void all_tasks_claimed(T0 first_skipped, Ts... more_skipped) {
108109
static_assert(std::is_convertible<T0, uint>::value, "not convertible");
109110
uint skipped[] = { static_cast<uint>(first_skipped), static_cast<uint>(more_skipped)... };

src/hotspot/share/metaprogramming/logical.hpp

Lines changed: 0 additions & 64 deletions
This file was deleted.

test/hotspot/gtest/metaprogramming/test_logical.cpp

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)