Skip to content

Commit 0a7a96d

Browse files
committed
Fix merge in ClauseT.h
1 parent 96a73ab commit 0a7a96d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

llvm/include/llvm/Frontend/OpenMP/ClauseT.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,15 +1254,14 @@ using ExtensionClausesT =
12541254
template <typename T, typename I, typename E>
12551255
using EmptyClausesT = std::variant<
12561256
AcqRelT<T, I, E>, AcquireT<T, I, E>, CaptureT<T, I, E>, CompareT<T, I, E>,
1257-
DynamicAllocatorsT<T, I, E>, DynGroupprivateT<T, I, E>, FullT<T, I, E>,
1258-
InbranchT<T, I, E>, MergeableT<T, I, E>, NogroupT<T, I, E>,
1259-
NoOpenmpRoutinesT<T, I, E>, NoOpenmpT<T, I, E>, NoParallelismT<T, I, E>,
1260-
NotinbranchT<T, I, E>, NowaitT<T, I, E>, ReadT<T, I, E>, RelaxedT<T, I, E>,
1261-
ReleaseT<T, I, E>, ReverseOffloadT<T, I, E>, SeqCstT<T, I, E>,
1262-
SimdT<T, I, E>, ThreadsT<T, I, E>, UnifiedAddressT<T, I, E>,
1263-
UnifiedSharedMemoryT<T, I, E>, UnknownT<T, I, E>, UntiedT<T, I, E>,
1264-
UseT<T, I, E>, WeakT<T, I, E>, WriteT<T, I, E>,
1265-
NoOpenmpConstructsT<T, I, E>, SelfMapsT<T, I, E>>;
1257+
DynamicAllocatorsT<T, I, E>, FullT<T, I, E>, InbranchT<T, I, E>,
1258+
MergeableT<T, I, E>, NogroupT<T, I, E>, NoOpenmpRoutinesT<T, I, E>,
1259+
NoOpenmpT<T, I, E>, NoParallelismT<T, I, E>, NotinbranchT<T, I, E>,
1260+
NowaitT<T, I, E>, ReadT<T, I, E>, RelaxedT<T, I, E>, ReleaseT<T, I, E>,
1261+
ReverseOffloadT<T, I, E>, SeqCstT<T, I, E>, SimdT<T, I, E>,
1262+
ThreadsT<T, I, E>, UnifiedAddressT<T, I, E>, UnifiedSharedMemoryT<T, I, E>,
1263+
UnknownT<T, I, E>, UntiedT<T, I, E>, UseT<T, I, E>, WeakT<T, I, E>,
1264+
WriteT<T, I, E>, NoOpenmpConstructsT<T, I, E>, SelfMapsT<T, I, E>>;
12661265

12671266
template <typename T, typename I, typename E>
12681267
using IncompleteClausesT =

0 commit comments

Comments
 (0)