Skip to content

Commit c1087c8

Browse files
[Backport to llvm_release_170] Explicitly cast OCLMemOrderKind members from std::memory_order in C++20 case (#3259)
Backport of PR #3254 into `llvm_release_170`. All commits applied cleanly. Co-authored-by: Jakub Jakacki <jakub.jakacki@intel.com>
1 parent addc58a commit c1087c8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/SPIRV/OCLUtil.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ enum OCLScopeKind {
9999
// the corresponding constants from 'std::memory_order' enum.
100100
enum OCLMemOrderKind {
101101
#if __cplusplus >= 202002L
102-
OCLMO_relaxed = std::memory_order_relaxed,
103-
OCLMO_acquire = std::memory_order_acquire,
104-
OCLMO_release = std::memory_order_release,
105-
OCLMO_acq_rel = std::memory_order_acq_rel,
106-
OCLMO_seq_cst = std::memory_order_seq_cst
102+
OCLMO_relaxed = static_cast<int>(std::memory_order::relaxed),
103+
OCLMO_acquire = static_cast<int>(std::memory_order::acquire),
104+
OCLMO_release = static_cast<int>(std::memory_order::release),
105+
OCLMO_acq_rel = static_cast<int>(std::memory_order::acq_rel),
106+
OCLMO_seq_cst = static_cast<int>(std::memory_order::seq_cst)
107107
#else
108108
OCLMO_relaxed = std::memory_order::memory_order_relaxed,
109109
OCLMO_acquire = std::memory_order::memory_order_acquire,

0 commit comments

Comments
 (0)