Fix merge with CMSSW_10_2_XP_Patatrack

Author: fwyzard

RecoLocalTracker/SiPixelRecHits/plugins/siPixelRecHitsHeterogeneousProduct.h

@@ -5,22 +5,19 @@
 #include <vector>
 
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-#include "HeterogeneousCore/Product/interface/HeterogeneousProduct.h"
-#include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/CUDAHostAllocator.h"
-
-namespace pixelCPEforGPU {
-  struct ParamsOnGPU;
-}
+#include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h"
+#include "HeterogeneousCore/Product/interface/HeterogeneousProduct.h"
+#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h"
 
 namespace siPixelRecHitsHeterogeneousProduct {
 
   using CPUProduct = int; // dummy
 
   struct HitsOnGPU{
-     pixelCPEforGPU::ParamsOnGPU const * cpeParams = nullptr;    // forwarded from setup, NOT owned
+     pixelCPEforGPU::ParamsOnGPU cpeParams;     // forwarded from setup, NOT owned
      float * bs_d;
-     const uint32_t * hitsModuleStart_d; // forwarded from clusters
+     const uint32_t * hitsModuleStart_d;        // forwarded from clusters
      uint32_t * hitsLayerStart_d;
      int32_t  * charge_d;
      uint16_t * detInd_d;