From c556528ea4ba25848f000de033c1ee00180399b2 Mon Sep 17 00:00:00 2001
From: F5 <i@f5soft.site>
Date: Sun, 21 Apr 2024 10:30:29 +0800
Subject: [PATCH] mpi, mtp: Use override syntax for HybridSimulatorImpl

---
 src/mpi/model/hybrid-simulator-impl.cc |  4 +--
 src/mpi/model/hybrid-simulator-impl.h  | 42 +++++++++++++-------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/mpi/model/hybrid-simulator-impl.cc b/src/mpi/model/hybrid-simulator-impl.cc
index 786301a9f..d45b72d7c 100644
--- a/src/mpi/model/hybrid-simulator-impl.cc
+++ b/src/mpi/model/hybrid-simulator-impl.cc
@@ -128,11 +128,11 @@ HybridSimulatorImpl::Stop()
     }
 }
 
-void
+EventId
 HybridSimulatorImpl::Stop(const Time& delay)
 {
     NS_LOG_FUNCTION(this << delay.GetTimeStep());
-    Simulator::Schedule(delay, &Simulator::Stop);
+    return Simulator::Schedule(delay, &Simulator::Stop);
 }
 
 EventId
diff --git a/src/mpi/model/hybrid-simulator-impl.h b/src/mpi/model/hybrid-simulator-impl.h
index 1813e16d2..d3ce53910 100644
--- a/src/mpi/model/hybrid-simulator-impl.h
+++ b/src/mpi/model/hybrid-simulator-impl.h
@@ -52,32 +52,32 @@ class HybridSimulatorImpl : public SimulatorImpl
     /** Default constructor. */
     HybridSimulatorImpl();
     /** Destructor. */
-    ~HybridSimulatorImpl();
+    ~HybridSimulatorImpl() override;
 
     // virtual from SimulatorImpl
-    virtual void Destroy();
-    virtual bool IsFinished() const;
-    virtual void Stop();
-    virtual void Stop(const Time& delay);
-    virtual EventId Schedule(const Time& delay, EventImpl* event);
-    virtual void ScheduleWithContext(uint32_t context, const Time& delay, EventImpl* event);
-    virtual EventId ScheduleNow(EventImpl* event);
-    virtual EventId ScheduleDestroy(EventImpl* event);
-    virtual void Remove(const EventId& id);
-    virtual void Cancel(const EventId& id);
-    virtual bool IsExpired(const EventId& id) const;
-    virtual void Run();
-    virtual Time Now() const;
-    virtual Time GetDelayLeft(const EventId& id) const;
-    virtual Time GetMaximumSimulationTime() const;
-    virtual void SetScheduler(ObjectFactory schedulerFactory);
-    virtual uint32_t GetSystemId() const;
-    virtual uint32_t GetContext() const;
-    virtual uint64_t GetEventCount() const;
+    void Destroy() override;
+    bool IsFinished() const override;
+    void Stop() override;
+    EventId Stop(const Time& delay) override;
+    EventId Schedule(const Time& delay, EventImpl* event) override;
+    void ScheduleWithContext(uint32_t context, const Time& delay, EventImpl* event) override;
+    EventId ScheduleNow(EventImpl* event) override;
+    EventId ScheduleDestroy(EventImpl* event) override;
+    void Remove(const EventId& id) override;
+    void Cancel(const EventId& id) override;
+    bool IsExpired(const EventId& id) const override;
+    void Run() override;
+    Time Now() const override;
+    Time GetDelayLeft(const EventId& id) const override;
+    Time GetMaximumSimulationTime() const override;
+    void SetScheduler(ObjectFactory schedulerFactory) override;
+    uint32_t GetSystemId() const override;
+    uint32_t GetContext() const override;
+    uint64_t GetEventCount() const override;
 
   private:
     // Inherited from Object
-    virtual void DoDispose();
+    void DoDispose() override;
 
     /**
      * @brief Whether LPs on the current local process is finished.