From 2c7ee64a5eeaa77ff53a631d8ea635664939ddbf Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 11 Mar 2014 16:42:04 -0500 Subject: [PATCH] Remove incorrect reflex protection from HcalDbService 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. --- CalibFormats/HcalObjects/interface/HcalDbService.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CalibFormats/HcalObjects/interface/HcalDbService.h b/CalibFormats/HcalObjects/interface/HcalDbService.h index 0564e23b3fd87..af0508d953d4f 100644 --- a/CalibFormats/HcalObjects/interface/HcalDbService.h +++ b/CalibFormats/HcalObjects/interface/HcalDbService.h @@ -8,9 +8,7 @@ #include #include -#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__) #include -#endif #include "DataFormats/HcalDetId/interface/HcalGenericDetId.h" #include "CalibFormats/HcalObjects/interface/HcalChannelCoder.h" @@ -91,14 +89,8 @@ class HcalDbService { const HcalPFCorrs* mPFCorrs; const HcalLutMetadata* mLutMetadata; // bool mPedestalInADC; -#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__) mutable std::atomic mCalibSet; mutable std::atomic mCalibWidthSet; -#else - mutable HcalCalibrationsSet mCalibSet; - mutable HcalCalibrationWidthsSet mCalibWidthSet; - mutable bool mUpdateCalibrations, mUpdateCalibWidths; -#endif }; #endif