Skip to content

Commit d979645

Browse files
ktfktf
committed
Misc fixes for C++20
Apparently specifying the template specialization for trivial case is now an error.
1 parent 9aad898 commit d979645

4 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎Detectors/MUON/MCH/Tracking/src/TrackFinderSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class TrackFinderTask
6666
{
6767
public:
6868
//_________________________________________________________________________________________________
69-
TrackFinderTask<T>(bool computeTime, bool digits, std::shared_ptr<base::GRPGeomRequest> req)
69+
TrackFinderTask(bool computeTime, bool digits, std::shared_ptr<base::GRPGeomRequest> req)
7070
: mComputeTime(computeTime), mDigits(digits), mCCDBRequest(req) {}
7171

7272
//_________________________________________________________________________________________________

‎Detectors/MUON/MID/Workflow/src/RawCheckerSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ template <typename RAWCHECKER>
4848
class RawCheckerDeviceDPL
4949
{
5050
public:
51-
RawCheckerDeviceDPL<RAWCHECKER>(const std::vector<uint16_t>& feeIds, const CrateMasks& crateMasks, const ElectronicsDelay& electronicsDelay) : mFeeIds(feeIds), mCrateMasks(crateMasks), mElectronicsDelay(electronicsDelay) {}
51+
RawCheckerDeviceDPL(const std::vector<uint16_t>& feeIds, const CrateMasks& crateMasks, const ElectronicsDelay& electronicsDelay) : mFeeIds(feeIds), mCrateMasks(crateMasks), mElectronicsDelay(electronicsDelay) {}
5252

5353
void init(o2::framework::InitContext& ic)
5454
{

‎GPU/GPUTracking/DataTypes/GPUTRDInterfaceO2Track.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ template <>
4747
class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov
4848
{
4949
public:
50-
GPUdDefault() trackInterface<o2::track::TrackParCov>() = default;
51-
trackInterface<o2::track::TrackParCov>(const o2::track::TrackParCov& param) = delete;
52-
GPUd() trackInterface<o2::track::TrackParCov>(const o2::dataformats::TrackTPCITS& trkItsTpc) : o2::track::TrackParCov(trkItsTpc.getParamOut()) {}
53-
GPUd() trackInterface<o2::track::TrackParCov>(const o2::tpc::TrackTPC& trkTpc) : o2::track::TrackParCov(trkTpc.getParamOut()) {}
50+
GPUdDefault() trackInterface() = default;
51+
trackInterface(const o2::track::TrackParCov& param) = delete;
52+
GPUd() trackInterface(const o2::dataformats::TrackTPCITS& trkItsTpc) : o2::track::TrackParCov(trkItsTpc.getParamOut()) {}
53+
GPUd() trackInterface(const o2::tpc::TrackTPC& trkTpc) : o2::track::TrackParCov(trkTpc.getParamOut()) {}
5454

5555
GPUd() void set(float x, float alpha, const float* param, const float* cov)
5656
{
@@ -63,8 +63,8 @@ class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov
6363
setCov(cov[i], i);
6464
}
6565
}
66-
GPUd() trackInterface<o2::track::TrackParCov>(const GPUTPCGMMergedTrack& trk);
67-
GPUd() trackInterface<o2::track::TrackParCov>(const gputpcgmmergertypes::GPUTPCOuterParam& param);
66+
GPUd() trackInterface(const GPUTPCGMMergedTrack& trk);
67+
GPUd() trackInterface(const gputpcgmmergertypes::GPUTPCOuterParam& param);
6868
GPUd() void updateCovZ2(float addZerror) { updateCov(addZerror, o2::track::CovLabels::kSigZ2); }
6969
GPUd() o2::track::TrackLTIntegral& getLTIntegralOut() { return mLTOut; }
7070
GPUd() const o2::track::TrackLTIntegral& getLTIntegralOut() const { return mLTOut; }

‎GPU/GPUTracking/TRDTracking/GPUTRDInterfaces.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ class propagatorInterface<AliTrackerBase> : public AliTrackerBase
101101

102102
public:
103103
typedef void propagatorParam;
104-
propagatorInterface<AliTrackerBase>(const propagatorParam* = nullptr) : AliTrackerBase(), mParam(nullptr){};
105-
propagatorInterface<AliTrackerBase>(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
106-
propagatorInterface<AliTrackerBase>& operator=(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
104+
propagatorInterface(const propagatorParam* = nullptr) : AliTrackerBase(), mParam(nullptr){};
105+
propagatorInterface(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
106+
propagatorInterface& operator=(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
107107

108108
bool propagateToX(float x, float maxSnp, float maxStep) { return PropagateTrackToBxByBz(mParam, x, 0.13957, maxStep, false, maxSnp); }
109109
int getPropagatedYZ(float x, float& projY, float& projZ)
@@ -147,9 +147,9 @@ class propagatorInterface<o2::base::Propagator>
147147
{
148148
public:
149149
typedef o2::base::Propagator propagatorParam;
150-
GPUd() propagatorInterface<o2::base::Propagator>(const propagatorParam* prop) : mProp(prop){};
151-
GPUd() propagatorInterface<o2::base::Propagator>(const propagatorInterface<o2::base::Propagator>&) = delete;
152-
GPUd() propagatorInterface<o2::base::Propagator>& operator=(const propagatorInterface<o2::base::Propagator>&) = delete;
150+
GPUd() propagatorInterface(const propagatorParam* prop) : mProp(prop){};
151+
GPUd() propagatorInterface(const propagatorInterface<o2::base::Propagator>&) = delete;
152+
GPUd() propagatorInterface& operator=(const propagatorInterface<o2::base::Propagator>&) = delete;
153153

154154
GPUdi() bool propagateToX(float x, float maxSnp, float maxStep) { return mProp->PropagateToXBxByBz(*mParam, x, maxSnp, maxStep); }
155155
GPUdi() int getPropagatedYZ(float x, float& projY, float& projZ) { return static_cast<int>(mParam->getYZAt(x, mProp->getNominalBz(), projY, projZ)); }
@@ -206,10 +206,10 @@ template <>
206206
class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
207207
{
208208
public:
209-
GPUdDefault() trackInterface<GPUTPCGMTrackParam>() CON_DEFAULT;
210-
GPUd() trackInterface<GPUTPCGMTrackParam>(const GPUTPCGMTrackParam& param) CON_DELETE;
211-
GPUd() trackInterface<GPUTPCGMTrackParam>(const GPUTPCGMMergedTrack& trk) : GPUTPCGMTrackParam(trk.GetParam()), mAlpha(trk.GetAlpha()) {}
212-
GPUd() trackInterface<GPUTPCGMTrackParam>(const gputpcgmmergertypes::GPUTPCOuterParam& param) : GPUTPCGMTrackParam(), mAlpha(param.alpha)
209+
GPUdDefault() trackInterface() CON_DEFAULT;
210+
GPUd() trackInterface(const GPUTPCGMTrackParam& param) CON_DELETE;
211+
GPUd() trackInterface(const GPUTPCGMMergedTrack& trk) : GPUTPCGMTrackParam(trk.GetParam()), mAlpha(trk.GetAlpha()) {}
212+
GPUd() trackInterface(const gputpcgmmergertypes::GPUTPCOuterParam& param) : GPUTPCGMTrackParam(), mAlpha(param.alpha)
213213
{
214214
SetX(param.X);
215215
for (int i = 0; i < 5; i++) {
@@ -220,11 +220,11 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
220220
}
221221
};
222222
#ifdef GPUCA_NOCOMPAT
223-
GPUdDefault() trackInterface<GPUTPCGMTrackParam>(const trackInterface<GPUTPCGMTrackParam>& param) = default;
224-
GPUdDefault() trackInterface<GPUTPCGMTrackParam>& operator=(const trackInterface<GPUTPCGMTrackParam>& param) = default;
223+
GPUdDefault() trackInterface(const trackInterface<GPUTPCGMTrackParam>& param) = default;
224+
GPUdDefault() trackInterface& operator=(const trackInterface<GPUTPCGMTrackParam>& param) = default;
225225
#endif
226226
#ifdef GPUCA_ALIROOT_LIB
227-
trackInterface<GPUTPCGMTrackParam>(const AliHLTExternalTrackParam& param) : GPUTPCGMTrackParam(), mAlpha(param.fAlpha)
227+
trackInterface(const AliHLTExternalTrackParam& param) : GPUTPCGMTrackParam(), mAlpha(param.fAlpha)
228228
{
229229
SetX(param.fX);
230230
SetPar(0, param.fY);
@@ -238,7 +238,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
238238
};
239239
#endif
240240
#if defined(GPUCA_HAVE_O2HEADERS)
241-
GPUd() trackInterface<GPUTPCGMTrackParam>(const o2::dataformats::TrackTPCITS& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
241+
GPUd() trackInterface(const o2::dataformats::TrackTPCITS& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
242242
{
243243
SetX(param.getParamOut().getX());
244244
SetPar(0, param.getParamOut().getY());
@@ -250,7 +250,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
250250
SetCov(i, param.getParamOut().getCov()[i]);
251251
}
252252
}
253-
GPUd() trackInterface<GPUTPCGMTrackParam>(const o2::tpc::TrackTPC& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
253+
GPUd() trackInterface(const o2::tpc::TrackTPC& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
254254
{
255255
SetX(param.getParamOut().getX());
256256
SetPar(0, param.getParamOut().getY());
@@ -307,7 +307,7 @@ class propagatorInterface<GPUTPCGMPropagator> : public GPUTPCGMPropagator
307307
{
308308
public:
309309
typedef GPUTPCGMPolynomialField propagatorParam;
310-
GPUd() propagatorInterface<GPUTPCGMPropagator>(const propagatorParam* pField) : GPUTPCGMPropagator(), mTrack(nullptr)
310+
GPUd() propagatorInterface(const propagatorParam* pField) : GPUTPCGMPropagator(), mTrack(nullptr)
311311
{
312312
this->SetMaterialTPC();
313313
this->SetPolynomialField(pField);
@@ -316,8 +316,8 @@ class propagatorInterface<GPUTPCGMPropagator> : public GPUTPCGMPropagator
316316
this->SetFitInProjections(0);
317317
this->SelectFieldRegion(GPUTPCGMPropagator::TRD);
318318
};
319-
propagatorInterface<GPUTPCGMPropagator>(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
320-
propagatorInterface<GPUTPCGMPropagator>& operator=(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
319+
propagatorInterface(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
320+
propagatorInterface& operator=(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
321321
GPUd() void setTrack(trackInterface<GPUTPCGMTrackParam>* trk)
322322
{
323323
SetTrack(trk, trk->getAlpha());

0 commit comments

Comments
 (0)