Skip to content

Commit

Permalink
Remove incorrect reflex protection from HcalDbService
Browse files Browse the repository at this point in the history
The CPP conditional code to protect reflex from the C++11 syntax was
done incorrectly since the the memory layout of the two options were
not identical. Given that this file is never scanned by Reflex, it is
best to just remove the conditional code.
  • Loading branch information
Dr15Jones committed Mar 11, 2014
1 parent bd995af commit 2c7ee64
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions CalibFormats/HcalObjects/interface/HcalDbService.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@

#include <memory>
#include <map>
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
#include <atomic>
#endif

#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
#include "CalibFormats/HcalObjects/interface/HcalChannelCoder.h"
Expand Down Expand Up @@ -91,14 +89,8 @@ class HcalDbService {
const HcalPFCorrs* mPFCorrs;
const HcalLutMetadata* mLutMetadata;
// bool mPedestalInADC;
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
mutable std::atomic<HcalCalibrationsSet*> mCalibSet;
mutable std::atomic<HcalCalibrationWidthsSet*> mCalibWidthSet;
#else
mutable HcalCalibrationsSet mCalibSet;
mutable HcalCalibrationWidthsSet mCalibWidthSet;
mutable bool mUpdateCalibrations, mUpdateCalibWidths;
#endif
};

#endif

0 comments on commit 2c7ee64

Please sign in to comment.