Skip to content

Commit a7b42f0

Browse files
Fix segfault in std::swap with SoA tracks
1 parent deb308c commit a7b42f0

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

GPU/GPUTracking/SectorTracker/GPUTPCBaseTrackParam.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,10 @@ struct GPUTPCBaseTrackParamSkeleton
109109

110110
// Needed for sorting
111111
constexpr void swap(GPUTPCBaseTrackParamSkeleton<MemLayout::reference> a, GPUTPCBaseTrackParamSkeleton<MemLayout::reference> b) {
112-
using std::swap;
113-
swap(a.mX, b.mX);
114-
swap(a.mC, b.mC);
115-
swap(a.mZOffset, b.mZOffset);
116-
swap(a.mP, b.mP);
112+
std::swap(a.mX, b.mX);
113+
std::swap(a.mC, b.mC);
114+
std::swap(a.mZOffset, b.mZOffset);
115+
std::swap(a.mP, b.mP);
117116
}
118117

119118
using GPUTPCBaseTrackParam = MemLayout::wrapper<GPUTPCBaseTrackParamSkeleton, MemLayout::value>;

GPU/GPUTracking/SectorTracker/GPUTPCTrack.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ class GPUTPCTrackSkeleton
6161

6262
// Needed for sorting
6363
constexpr void swap(GPUTPCTrackSkeleton<MemLayout::reference> a, GPUTPCTrackSkeleton<MemLayout::reference> b) {
64-
using std::swap;
65-
swap(a.mFirstHitID, b.mFirstHitID);
66-
swap(a.mNHits, b.mNHits);
67-
swap(a.mLocalTrackId, b.mLocalTrackId);
64+
std::swap(a.mFirstHitID, b.mFirstHitID);
65+
std::swap(a.mNHits, b.mNHits);
66+
std::swap(a.mLocalTrackId, b.mLocalTrackId);
6867
swap(a.mParam, b.mParam);
6968
}
7069

0 commit comments

Comments
 (0)