From 6c80eafa74b3d3426ea289526c15c0df6b3aabf0 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Tue, 15 May 2018 16:46:03 +0200 Subject: [PATCH] Remove the use of #pragma once (#47) Replace `#pragma once` with classical include guards. --- .../interface/SiPixelGainForHLTonGPU.h | 12 +++++----- .../plugins/gpuCalibPixel.h | 11 ++++++---- .../plugins/gpuClustering.h | 6 +++-- .../SiPixelRecHits/interface/PixelCPEFast.h | 22 +++++++++---------- .../SiPixelRecHits/plugins/PixelRecHits.h | 9 +++++--- .../SiPixelRecHits/plugins/gpuPixelRecHits.h | 9 ++++---- 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h b/CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h index 12faeaaa9a845..8cf5451f91b93 100644 --- a/CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h +++ b/CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h @@ -1,9 +1,10 @@ -#pragma once +#ifndef CondFormats_SiPixelObjects_SiPixelGainForHLTonGPU_h +#define CondFormats_SiPixelObjects_SiPixelGainForHLTonGPU_h -#include -#include -#include -#include +#include +#include +#include +#include struct SiPixelGainForHLTonGPU_DecodingStructure{ uint8_t gain; @@ -67,3 +68,4 @@ class SiPixelGainForHLTonGPU { unsigned int noisyFlag_; }; +#endif // CondFormats_SiPixelObjects_SiPixelGainForHLTonGPU_h diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/gpuCalibPixel.h b/RecoLocalTracker/SiPixelClusterizer/plugins/gpuCalibPixel.h index fd2b28a4719e8..5e1c2a7486b56 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/gpuCalibPixel.h +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/gpuCalibPixel.h @@ -1,10 +1,11 @@ -#pragma once - -#include "CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h" +#ifndef RecoLocalTracker_SiPixelClusterizer_plugins_gpuCalibPixel_h +#define RecoLocalTracker_SiPixelClusterizer_plugins_gpuCalibPixel_h +#include #include #include -#include + +#include "CondFormats/SiPixelObjects/interface/SiPixelGainForHLTonGPU.h" namespace gpuCalibPixel { @@ -123,3 +124,5 @@ namespace gpuCalibPixel { } + +#endif // RecoLocalTracker_SiPixelClusterizer_plugins_gpuCalibPixel_h diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h b/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h index 5ac7375e008cc..672a4dbe97450 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/gpuClustering.h @@ -1,8 +1,9 @@ -#pragma once +#ifndef RecoLocalTracker_SiPixelClusterizer_plugins_gpuClustering_h +#define RecoLocalTracker_SiPixelClusterizer_plugins_gpuClustering_h +#include #include #include -#include namespace gpuClustering { @@ -166,3 +167,4 @@ namespace gpuClustering { } //namespace gpuClustering +#endif // RecoLocalTracker_SiPixelClusterizer_plugins_gpuClustering_h diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h index d845cddd6702e..a283cb1fa74ce 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h @@ -1,19 +1,15 @@ -#pragma once - -#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h" -#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" -#include "CalibTracker/SiPixelESProducers/interface/SiPixelCPEGenericDBErrorParametrization.h" - - -// The template header files -#include "RecoLocalTracker/SiPixelRecHits/interface/SiPixelTemplate.h" -#include "RecoLocalTracker/SiPixelRecHits/interface/SiPixelGenError.h" - -#include "HeterogeneousCore/CUDAUtilities/interface/CUDAHostAllocator.h" +#ifndef RecoLocalTracker_SiPixelRecHits_PixelCPEFast_h +#define RecoLocalTracker_SiPixelRecHits_PixelCPEFast_h #include #include +#include "CalibTracker/SiPixelESProducers/interface/SiPixelCPEGenericDBErrorParametrization.h" +#include "HeterogeneousCore/CUDAUtilities/interface/CUDAHostAllocator.h" +#include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" +#include "RecoLocalTracker/SiPixelRecHits/interface/SiPixelGenError.h" +#include "RecoLocalTracker/SiPixelRecHits/interface/SiPixelTemplate.h" +#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h" class MagneticField; class PixelCPEFast final : public PixelCPEBase @@ -85,3 +81,5 @@ public : pixelCPEforGPU::ParamsOnGPU h_paramsOnGPU; pixelCPEforGPU::ParamsOnGPU * d_paramsOnGPU; // copy of the above on the Device }; + +#endif // RecoLocalTracker_SiPixelRecHits_PixelCPEFast_h diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.h b/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.h index 632f5c64e2b9f..75976ad697a1a 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.h +++ b/RecoLocalTracker/SiPixelRecHits/plugins/PixelRecHits.h @@ -1,7 +1,8 @@ -#pragma once +#ifndef RecoLocalTracker_SiPixelRecHits_plugins_PixelRecHits_h +#define RecoLocalTracker_SiPixelRecHits_plugins_PixelRecHits_h -#include -#include +#include +#include namespace pixelCPEforGPU { struct ParamsOnGPU; @@ -37,3 +38,5 @@ HitsOnCPU pixelRecHits_wrapper( uint32_t nModules, // active modules (with digis) HitsOnGPU & hh ); + +#endif // RecoLocalTracker_SiPixelRecHits_plugins_PixelRecHits_h diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h b/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h index 2a6f2d0c3d926..14e4f5f26aaa1 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h +++ b/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h @@ -1,12 +1,12 @@ -#pragma once - -#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h" +#ifndef RecoLocalTracker_SiPixelRecHits_plugins_gpuPixelRecHits_h +#define RecoLocalTracker_SiPixelRecHits_plugins_gpuPixelRecHits_h +#include #include #include #include -#include +#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h" namespace gpuPixelRecHits { @@ -132,3 +132,4 @@ namespace gpuPixelRecHits { } +#endif // RecoLocalTracker_SiPixelRecHits_plugins_gpuPixelRecHits_h