Fix rebase errors

DDG4/include/DDG4/DDG4Dict.h

@@ -83,11 +83,9 @@ namespace { class DDG4Dict {};   }
 
 /// Dictionaires for basic Hit data structures
 #pragma link C++ class dd4hep::sim::Geant4HitData+;
-
 namespace dd4hep { namespace sim { typedef Geant4HitData* Geant4HitData_ptr_t; }}
 #pragma link C++ typedef dd4hep::sim::Geant4HitData_ptr_t;
 #pragma link C++ class std::vector<dd4hep::sim::Geant4HitData_ptr_t>+;
-#pragma link C++ class std::vector<dd4hep::sim::Geant4HitData*>+;
 #pragma link C++ class dd4hep::sim::Geant4HitData::Contribution+;
 #pragma link C++ class dd4hep::sim::Geant4HitData::Contributions+;
 

DDG4/include/DDG4/Geant4StackingAction.h

@@ -98,7 +98,7 @@ namespace dd4hep {
       /// Default destructor
       virtual ~Geant4SharedStackingAction();
       /// Set or update client for the use in a new thread fiber
-      virtual void configureFiber(Geant4Context* thread_context);
+      virtual void configureFiber(Geant4Context* thread_context)  override;
       /// Underlying object to be used during the execution of this thread
       virtual void use(Geant4StackingAction* action);
       /// New-stage callback
@@ -142,9 +142,9 @@ namespace dd4hep {
       /// Default destructor
       virtual ~Geant4StackingActionSequence();
       /// Set or update client context
-      virtual void updateContext(Geant4Context* ctxt);
+      virtual void updateContext(Geant4Context* ctxt)  override;
       /// Set or update client for the use in a new thread fiber
-      virtual void configureFiber(Geant4Context* thread_context);
+      virtual void configureFiber(Geant4Context* thread_context)  override;
       /// Get an action by name
       Geant4StackingAction* get(const std::string& name) const;
       /// Register begin-of-event callback. Types Q and T must be polymorph!