F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtp: Use override syntax instead of virtual

Browse Source
This commit is contained in:
F5
2024-03-26 14:46:30 +08:00
parent 08db4ac6d7
commit 6046f4f889
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mtp/CMakeLists.txt
View File

@@ -21,7 +21,6 @@ build_lib(
model/logical-process.h model/logical-process.h
model/mtp-interface.h model/mtp-interface.h
model/multithreaded-simulator-impl.h model/multithreaded-simulator-impl.h
LIBRARIES_TO_LINK ${libcore} LIBRARIES_TO_LINK ${libnetwork}
${libnetwork}
TEST_SOURCES ${example_as_test_suite} TEST_SOURCES ${example_as_test_suite}
) )

4
src/mtp/model/multithreaded-simulator-impl.cc
View File

@@ -118,11 +118,11 @@ MultithreadedSimulatorImpl::Stop()
} }
} }
void EventId
MultithreadedSimulatorImpl::Stop(const Time& delay) MultithreadedSimulatorImpl::Stop(const Time& delay)
{ {
NS_LOG_FUNCTION(this << delay.GetTimeStep()); NS_LOG_FUNCTION(this << delay.GetTimeStep());
Simulator::Schedule(delay, &Simulator::Stop); return Simulator::Schedule(delay, &Simulator::Stop);
} }
EventId EventId

42
src/mtp/model/multithreaded-simulator-impl.h
View File

@@ -49,32 +49,32 @@ class MultithreadedSimulatorImpl : public SimulatorImpl
/** Default constructor. */ /** Default constructor. */
MultithreadedSimulatorImpl(); MultithreadedSimulatorImpl();
/** Destructor. */ /** Destructor. */
~MultithreadedSimulatorImpl(); ~MultithreadedSimulatorImpl() override;
// virtual from SimulatorImpl // virtual from SimulatorImpl
virtual void Destroy(); void Destroy() override;
virtual bool IsFinished() const; bool IsFinished() const override;
virtual void Stop(); void Stop() override;
virtual void Stop(const Time& delay); EventId Stop(const Time& delay) override;
virtual EventId Schedule(const Time& delay, EventImpl* event); EventId Schedule(const Time& delay, EventImpl* event) override;
virtual void ScheduleWithContext(uint32_t context, const Time& delay, EventImpl* event); void ScheduleWithContext(uint32_t context, const Time& delay, EventImpl* event) override;
virtual EventId ScheduleNow(EventImpl* event); EventId ScheduleNow(EventImpl* event) override;
virtual EventId ScheduleDestroy(EventImpl* event); EventId ScheduleDestroy(EventImpl* event) override;
virtual void Remove(const EventId& id); void Remove(const EventId& id) override;
virtual void Cancel(const EventId& id); void Cancel(const EventId& id) override;
virtual bool IsExpired(const EventId& id) const; bool IsExpired(const EventId& id) const override;
virtual void Run(); void Run() override;
virtual Time Now() const; Time Now() const override;
virtual Time GetDelayLeft(const EventId& id) const; Time GetDelayLeft(const EventId& id) const override;
virtual Time GetMaximumSimulationTime() const; Time GetMaximumSimulationTime() const override;
virtual void SetScheduler(ObjectFactory schedulerFactory); void SetScheduler(ObjectFactory schedulerFactory) override;
virtual uint32_t GetSystemId() const; uint32_t GetSystemId() const override;
virtual uint32_t GetContext() const; uint32_t GetContext() const override;
virtual uint64_t GetEventCount() const; uint64_t GetEventCount() const override;
private: private:
// Inherited from Object // Inherited from Object
virtual void DoDispose(); void DoDispose() override;
/** /**
* @brief Automatically divides the to-be-simulated topology * @brief Automatically divides the to-be-simulated topology