Skip to content

Commit

Permalink
Misc fixes for C++20
Browse files Browse the repository at this point in the history 
Apparently specifying the template specialization for trivial case is now an error.
  • Loading branch information
@ktf
ktf committed Nov 27, 2023
1 parent 9aad898 commit d979645
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Detectors/MUON/MCH/Tracking/src/TrackFinderSpec.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class TrackFinderTask
{
public:
//_________________________________________________________________________________________________
TrackFinderTask<T>(bool computeTime, bool digits, std::shared_ptr<base::GRPGeomRequest> req)
TrackFinderTask(bool computeTime, bool digits, std::shared_ptr<base::GRPGeomRequest> req)
: mComputeTime(computeTime), mDigits(digits), mCCDBRequest(req) {}

//_________________________________________________________________________________________________
Expand Down
2 changes: 1 addition & 1 deletion Detectors/MUON/MID/Workflow/src/RawCheckerSpec.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ template <typename RAWCHECKER>
class RawCheckerDeviceDPL
{
public:
RawCheckerDeviceDPL<RAWCHECKER>(const std::vector<uint16_t>& feeIds, const CrateMasks& crateMasks, const ElectronicsDelay& electronicsDelay) : mFeeIds(feeIds), mCrateMasks(crateMasks), mElectronicsDelay(electronicsDelay) {}
RawCheckerDeviceDPL(const std::vector<uint16_t>& feeIds, const CrateMasks& crateMasks, const ElectronicsDelay& electronicsDelay) : mFeeIds(feeIds), mCrateMasks(crateMasks), mElectronicsDelay(electronicsDelay) {}

void init(o2::framework::InitContext& ic)
{
Expand Down
12 changes: 6 additions & 6 deletions GPU/GPUTracking/DataTypes/GPUTRDInterfaceO2Track.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ template <>
class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov
{
public:
GPUdDefault() trackInterface<o2::track::TrackParCov>() = default;
trackInterface<o2::track::TrackParCov>(const o2::track::TrackParCov& param) = delete;
GPUd() trackInterface<o2::track::TrackParCov>(const o2::dataformats::TrackTPCITS& trkItsTpc) : o2::track::TrackParCov(trkItsTpc.getParamOut()) {}
GPUd() trackInterface<o2::track::TrackParCov>(const o2::tpc::TrackTPC& trkTpc) : o2::track::TrackParCov(trkTpc.getParamOut()) {}
GPUdDefault() trackInterface() = default;
trackInterface(const o2::track::TrackParCov& param) = delete;
GPUd() trackInterface(const o2::dataformats::TrackTPCITS& trkItsTpc) : o2::track::TrackParCov(trkItsTpc.getParamOut()) {}
GPUd() trackInterface(const o2::tpc::TrackTPC& trkTpc) : o2::track::TrackParCov(trkTpc.getParamOut()) {}

GPUd() void set(float x, float alpha, const float* param, const float* cov)
{
Expand All @@ -63,8 +63,8 @@ class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov
setCov(cov[i], i);
}
}
GPUd() trackInterface<o2::track::TrackParCov>(const GPUTPCGMMergedTrack& trk);
GPUd() trackInterface<o2::track::TrackParCov>(const gputpcgmmergertypes::GPUTPCOuterParam& param);
GPUd() trackInterface(const GPUTPCGMMergedTrack& trk);
GPUd() trackInterface(const gputpcgmmergertypes::GPUTPCOuterParam& param);
GPUd() void updateCovZ2(float addZerror) { updateCov(addZerror, o2::track::CovLabels::kSigZ2); }
GPUd() o2::track::TrackLTIntegral& getLTIntegralOut() { return mLTOut; }
GPUd() const o2::track::TrackLTIntegral& getLTIntegralOut() const { return mLTOut; }
Expand Down
36 changes: 18 additions & 18 deletions GPU/GPUTracking/TRDTracking/GPUTRDInterfaces.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ class propagatorInterface<AliTrackerBase> : public AliTrackerBase

public:
typedef void propagatorParam;
propagatorInterface<AliTrackerBase>(const propagatorParam* = nullptr) : AliTrackerBase(), mParam(nullptr){};
propagatorInterface<AliTrackerBase>(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
propagatorInterface<AliTrackerBase>& operator=(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
propagatorInterface(const propagatorParam* = nullptr) : AliTrackerBase(), mParam(nullptr){};
propagatorInterface(const propagatorInterface<AliTrackerBase>&) CON_DELETE;
propagatorInterface& operator=(const propagatorInterface<AliTrackerBase>&) CON_DELETE;

bool propagateToX(float x, float maxSnp, float maxStep) { return PropagateTrackToBxByBz(mParam, x, 0.13957, maxStep, false, maxSnp); }
int getPropagatedYZ(float x, float& projY, float& projZ)
Expand Down Expand Up @@ -147,9 +147,9 @@ class propagatorInterface<o2::base::Propagator>
{
public:
typedef o2::base::Propagator propagatorParam;
GPUd() propagatorInterface<o2::base::Propagator>(const propagatorParam* prop) : mProp(prop){};
GPUd() propagatorInterface<o2::base::Propagator>(const propagatorInterface<o2::base::Propagator>&) = delete;
GPUd() propagatorInterface<o2::base::Propagator>& operator=(const propagatorInterface<o2::base::Propagator>&) = delete;
GPUd() propagatorInterface(const propagatorParam* prop) : mProp(prop){};
GPUd() propagatorInterface(const propagatorInterface<o2::base::Propagator>&) = delete;
GPUd() propagatorInterface& operator=(const propagatorInterface<o2::base::Propagator>&) = delete;

GPUdi() bool propagateToX(float x, float maxSnp, float maxStep) { return mProp->PropagateToXBxByBz(*mParam, x, maxSnp, maxStep); }
GPUdi() int getPropagatedYZ(float x, float& projY, float& projZ) { return static_cast<int>(mParam->getYZAt(x, mProp->getNominalBz(), projY, projZ)); }
Expand Down Expand Up @@ -206,10 +206,10 @@ template <>
class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
{
public:
GPUdDefault() trackInterface<GPUTPCGMTrackParam>() CON_DEFAULT;
GPUd() trackInterface<GPUTPCGMTrackParam>(const GPUTPCGMTrackParam& param) CON_DELETE;
GPUd() trackInterface<GPUTPCGMTrackParam>(const GPUTPCGMMergedTrack& trk) : GPUTPCGMTrackParam(trk.GetParam()), mAlpha(trk.GetAlpha()) {}
GPUd() trackInterface<GPUTPCGMTrackParam>(const gputpcgmmergertypes::GPUTPCOuterParam& param) : GPUTPCGMTrackParam(), mAlpha(param.alpha)
GPUdDefault() trackInterface() CON_DEFAULT;
GPUd() trackInterface(const GPUTPCGMTrackParam& param) CON_DELETE;
GPUd() trackInterface(const GPUTPCGMMergedTrack& trk) : GPUTPCGMTrackParam(trk.GetParam()), mAlpha(trk.GetAlpha()) {}
GPUd() trackInterface(const gputpcgmmergertypes::GPUTPCOuterParam& param) : GPUTPCGMTrackParam(), mAlpha(param.alpha)
{
SetX(param.X);
for (int i = 0; i < 5; i++) {
Expand All @@ -220,11 +220,11 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
}
};
#ifdef GPUCA_NOCOMPAT
GPUdDefault() trackInterface<GPUTPCGMTrackParam>(const trackInterface<GPUTPCGMTrackParam>& param) = default;
GPUdDefault() trackInterface<GPUTPCGMTrackParam>& operator=(const trackInterface<GPUTPCGMTrackParam>& param) = default;
GPUdDefault() trackInterface(const trackInterface<GPUTPCGMTrackParam>& param) = default;
GPUdDefault() trackInterface& operator=(const trackInterface<GPUTPCGMTrackParam>& param) = default;
#endif
#ifdef GPUCA_ALIROOT_LIB
trackInterface<GPUTPCGMTrackParam>(const AliHLTExternalTrackParam& param) : GPUTPCGMTrackParam(), mAlpha(param.fAlpha)
trackInterface(const AliHLTExternalTrackParam& param) : GPUTPCGMTrackParam(), mAlpha(param.fAlpha)
{
SetX(param.fX);
SetPar(0, param.fY);
Expand All @@ -238,7 +238,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
};
#endif
#if defined(GPUCA_HAVE_O2HEADERS)
GPUd() trackInterface<GPUTPCGMTrackParam>(const o2::dataformats::TrackTPCITS& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
GPUd() trackInterface(const o2::dataformats::TrackTPCITS& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
{
SetX(param.getParamOut().getX());
SetPar(0, param.getParamOut().getY());
Expand All @@ -250,7 +250,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam
SetCov(i, param.getParamOut().getCov()[i]);
}
}
GPUd() trackInterface<GPUTPCGMTrackParam>(const o2::tpc::TrackTPC& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
GPUd() trackInterface(const o2::tpc::TrackTPC& param) : GPUTPCGMTrackParam(), mAlpha(param.getParamOut().getAlpha())
{
SetX(param.getParamOut().getX());
SetPar(0, param.getParamOut().getY());
Expand Down Expand Up @@ -307,7 +307,7 @@ class propagatorInterface<GPUTPCGMPropagator> : public GPUTPCGMPropagator
{
public:
typedef GPUTPCGMPolynomialField propagatorParam;
GPUd() propagatorInterface<GPUTPCGMPropagator>(const propagatorParam* pField) : GPUTPCGMPropagator(), mTrack(nullptr)
GPUd() propagatorInterface(const propagatorParam* pField) : GPUTPCGMPropagator(), mTrack(nullptr)
{
this->SetMaterialTPC();
this->SetPolynomialField(pField);
Expand All @@ -316,8 +316,8 @@ class propagatorInterface<GPUTPCGMPropagator> : public GPUTPCGMPropagator
this->SetFitInProjections(0);
this->SelectFieldRegion(GPUTPCGMPropagator::TRD);
};
propagatorInterface<GPUTPCGMPropagator>(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
propagatorInterface<GPUTPCGMPropagator>& operator=(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
propagatorInterface(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
propagatorInterface& operator=(const propagatorInterface<GPUTPCGMPropagator>&) CON_DELETE;
GPUd() void setTrack(trackInterface<GPUTPCGMTrackParam>* trk)
{
SetTrack(trk, trk->getAlpha());
Expand Down

0 comments on commit d979645

Please sign in to comment.