From 6046f4f889ecc04720d91af910f6d38656dca9ad Mon Sep 17 00:00:00 2001
From: F5 <i@f5soft.site>
Date: Tue, 26 Mar 2024 14:46:30 +0800
Subject: [PATCH] mtp: Use override syntax instead of virtual

---
 src/mtp/CMakeLists.txt                        |  3 +-
 src/mtp/model/multithreaded-simulator-impl.cc |  4 +-
 src/mtp/model/multithreaded-simulator-impl.h  | 42 +++++++++----------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/mtp/CMakeLists.txt b/src/mtp/CMakeLists.txt
index 4b1f93675..fb562aa20 100644
--- a/src/mtp/CMakeLists.txt
+++ b/src/mtp/CMakeLists.txt
@@ -21,7 +21,6 @@ build_lib(
     model/logical-process.h
     model/mtp-interface.h
     model/multithreaded-simulator-impl.h
-  LIBRARIES_TO_LINK ${libcore}
-                    ${libnetwork}
+  LIBRARIES_TO_LINK ${libnetwork}
   TEST_SOURCES ${example_as_test_suite}
 )
diff --git a/src/mtp/model/multithreaded-simulator-impl.cc b/src/mtp/model/multithreaded-simulator-impl.cc
index 492d33230..24b84e221 100644
--- a/src/mtp/model/multithreaded-simulator-impl.cc
+++ b/src/mtp/model/multithreaded-simulator-impl.cc
@@ -118,11 +118,11 @@ MultithreadedSimulatorImpl::Stop()
     }
 }
 
-void
+EventId
 MultithreadedSimulatorImpl::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/mtp/model/multithreaded-simulator-impl.h b/src/mtp/model/multithreaded-simulator-impl.h
index 006c68db0..699107a03 100644
--- a/src/mtp/model/multithreaded-simulator-impl.h
+++ b/src/mtp/model/multithreaded-simulator-impl.h
@@ -49,32 +49,32 @@ class MultithreadedSimulatorImpl : public SimulatorImpl
     /** Default constructor. */
     MultithreadedSimulatorImpl();
     /** Destructor. */
-    ~MultithreadedSimulatorImpl();
+    ~MultithreadedSimulatorImpl() 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 Automatically divides the to-be-simulated topology