From b7b5be00f286c47ea4d6d42e807f25384992787c Mon Sep 17 00:00:00 2001 From: Vlad Khorsun Date: Thu, 14 Jul 2022 22:32:11 +0300 Subject: [PATCH] Remove 'virtual' specifier from overridden methods to please VS intellisense. --- src/jrd/Monitoring.h | 6 +++--- src/jrd/event_proto.h | 6 +++--- src/jrd/replication/ChangeLog.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/jrd/Monitoring.h b/src/jrd/Monitoring.h index 0f4184f20a..b276140b27 100644 --- a/src/jrd/Monitoring.h +++ b/src/jrd/Monitoring.h @@ -322,9 +322,9 @@ public: bool initialize(Firebird::SharedMemoryBase*, bool) override; void mutexBug(int osErrorCode, const char* text) override; - virtual USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_DATABASE_SNAPSHOT; } - virtual USHORT getVersion() const override { return MONITOR_VERSION; } - virtual const char* getName() const override { return "MonitoringData"; } + USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_DATABASE_SNAPSHOT; } + USHORT getVersion() const override { return MONITOR_VERSION; } + const char* getName() const override { return "MonitoringData"; } void initSharedFile(); diff --git a/src/jrd/event_proto.h b/src/jrd/event_proto.h index b5eceb0f00..7ab5ac91e5 100644 --- a/src/jrd/event_proto.h +++ b/src/jrd/event_proto.h @@ -58,9 +58,9 @@ public: bool initialize(Firebird::SharedMemoryBase*, bool) override; void mutexBug(int osErrorCode, const char* text) override; - virtual USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_EVENT_MANAGER; } - virtual USHORT getVersion() const override { return EVENT_VERSION; } - virtual const char* getName() const override { return "EventManager";} + USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_EVENT_MANAGER; } + USHORT getVersion() const override { return EVENT_VERSION; } + const char* getName() const override { return "EventManager";} void exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync::ThreadRoutine* routine); diff --git a/src/jrd/replication/ChangeLog.h b/src/jrd/replication/ChangeLog.h index 6ef082e330..90af8f4af9 100644 --- a/src/jrd/replication/ChangeLog.h +++ b/src/jrd/replication/ChangeLog.h @@ -219,9 +219,9 @@ namespace Replication bool initialize(Firebird::SharedMemoryBase* shmem, bool init) override; void mutexBug(int osErrorCode, const char* text) override; - virtual USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_CHANGELOG_STATE; } - virtual USHORT getVersion() const override { return STATE_VERSION; }; - virtual const char* getName() const override { return "ChangeLog"; } + USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_CHANGELOG_STATE; } + USHORT getVersion() const override { return STATE_VERSION; }; + const char* getName() const override { return "ChangeLog"; } bool validateSegment(const Segment* segment) {