Merge branch 'clang.L1TopoSimulation-20170915' into 'master'

L1TopoSimulation: Fix clang warnings.

See merge request !4693

Trigger/TrigT1/L1Topo/L1TopoSimulation/src/AthenaL1TopoHistSvc.h

@@ -20,9 +20,9 @@ public:
 
    virtual TH1 * findHist(const std::string & histName) override;
 
-   virtual void setBaseDir(const std::string & baseDir);
+   virtual void setBaseDir(const std::string & baseDir) override;
 
-   virtual void save();
+   virtual void save() override;
 
 private:
 

Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h

@@ -96,8 +96,6 @@ namespace LVL1 {
 
       std::unique_ptr<TCS::TopoSteering>  m_topoSteering; //!< the topo steering 
 
-      TH1 *  m_DecisionHist[3] { nullptr, nullptr, nullptr };
-
       BooleanProperty m_fillHistogramsBasedOnHardwareDecision { false }; // default: fill based on simulation
       UnsignedIntegerProperty m_prescaleForDAQROBAccess {4}; ///< read hdw bits every N events (used only when m_fillHistogramsBasedOnHardwareDecision is true)
       UnsignedIntegerProperty m_prescale; //! property for prescale factor

Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h

@@ -47,9 +47,9 @@ namespace LVL1 {
 
       virtual StatusCode initialize() override;
 
-      virtual StatusCode fillTopoInputEvent(TCS::TopoInputEvent& ) const; 
+      virtual StatusCode fillTopoInputEvent(TCS::TopoInputEvent& ) const override;
 
-      virtual void handle(const Incident&);
+      virtual void handle(const Incident&) override;
 
    private: