@@ -36,16 +36,18 @@ class InternalProvider : public Provider
3636 {
3737 }
3838
39- ~InternalProvider ()
39+ ~InternalProvider () override
4040 {}
4141
42- virtual void jrdAttachmentEnd (Jrd::thread_db* tdbb, Jrd::Attachment* att, bool forced);
42+ void jrdAttachmentEnd (Jrd::thread_db* tdbb, Jrd::Attachment* att, bool forced) override ;
4343
44- virtual void initialize () {}
45- virtual void getRemoteError (const Jrd::FbStatusVector* status, Firebird::string& err) const ;
44+ void initialize () override
45+ {}
46+
47+ void getRemoteError (const Jrd::FbStatusVector* status, Firebird::string& err) const override ;
4648
4749protected:
48- virtual Connection* doCreateConnection ();
50+ Connection* doCreateConnection () override ;
4951};
5052
5153
@@ -59,7 +61,7 @@ class InternalConnection : public Connection
5961 m_attachment(0 )
6062 {}
6163
62- virtual ~InternalConnection ();
64+ ~InternalConnection () override ;
6365
6466public:
6567 void attach (Jrd::thread_db* tdbb) override ;
@@ -102,16 +104,16 @@ class InternalTransaction : public Transaction
102104 m_transaction(0 )
103105 {}
104106
105- virtual ~InternalTransaction () {}
107+ ~InternalTransaction () override = default ;
106108
107109public:
108110 Jrd::JTransaction* getJrdTran () { return m_transaction; }
109111
110112protected:
111- virtual void doStart (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, Firebird::ClumpletWriter& tpb);
112- virtual void doPrepare (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, int info_len, const char * info);
113- virtual void doCommit (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, bool retain);
114- virtual void doRollback (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, bool retain);
113+ void doStart (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, Firebird::ClumpletWriter& tpb) override ;
114+ void doPrepare (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, int info_len, const char * info) override ;
115+ void doCommit (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, bool retain) override ;
116+ void doRollback (Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, bool retain) override ;
115117
116118 InternalConnection& m_IntConnection;
117119 Firebird::RefPtr<Jrd::JTransaction> m_transaction;
@@ -124,15 +126,15 @@ class InternalStatement : public Statement
124126 friend class InternalConnection ;
125127
126128 explicit InternalStatement (InternalConnection& conn);
127- ~InternalStatement ();
129+ ~InternalStatement () override ;
128130
129131protected:
130- virtual void doPrepare (Jrd::thread_db* tdbb, const Firebird::string& sql);
131- virtual void doSetTimeout (Jrd::thread_db* tdbb, unsigned int timeout);
132- virtual void doExecute (Jrd::thread_db* tdbb);
133- virtual void doOpen (Jrd::thread_db* tdbb);
134- virtual bool doFetch (Jrd::thread_db* tdbb);
135- virtual void doClose (Jrd::thread_db* tdbb, bool drop);
132+ void doPrepare (Jrd::thread_db* tdbb, const Firebird::string& sql) override ;
133+ void doSetTimeout (Jrd::thread_db* tdbb, unsigned int timeout) override ;
134+ void doExecute (Jrd::thread_db* tdbb) override ;
135+ void doOpen (Jrd::thread_db* tdbb) override ;
136+ bool doFetch (Jrd::thread_db* tdbb) override ;
137+ void doClose (Jrd::thread_db* tdbb, bool drop) override ;
136138
137139 const char * getParameterName (unsigned index) const override
138140 {
@@ -145,8 +147,8 @@ class InternalStatement : public Statement
145147 return nullptr ;
146148 }
147149
148- virtual void putExtBlob (Jrd::thread_db* tdbb, dsc& src, dsc& dst);
149- virtual void getExtBlob (Jrd::thread_db* tdbb, const dsc& src, dsc& dst);
150+ void putExtBlob (Jrd::thread_db* tdbb, dsc& src, dsc& dst) override ;
151+ void getExtBlob (Jrd::thread_db* tdbb, const dsc& src, dsc& dst) override ;
150152
151153 InternalTransaction* getIntTransaction ()
152154 {
@@ -169,15 +171,15 @@ class InternalBlob : public Blob
169171 explicit InternalBlob (InternalConnection& conn);
170172
171173public:
172- ~InternalBlob ();
174+ ~InternalBlob () override ;
173175
174176public:
175- virtual void open (Jrd::thread_db* tdbb, Transaction& tran, const dsc& desc, const Firebird::UCharBuffer* bpb);
176- virtual void create (Jrd::thread_db* tdbb, Transaction& tran, dsc& desc, const Firebird::UCharBuffer* bpb);
177- virtual USHORT read (Jrd::thread_db* tdbb, UCHAR * buff, USHORT len);
178- virtual void write (Jrd::thread_db* tdbb, const UCHAR * buff, USHORT len);
179- virtual void close (Jrd::thread_db* tdbb);
180- virtual void cancel (Jrd::thread_db* tdbb);
177+ void open (Jrd::thread_db* tdbb, Transaction& tran, const dsc& desc, const Firebird::UCharBuffer* bpb) override ;
178+ void create (Jrd::thread_db* tdbb, Transaction& tran, dsc& desc, const Firebird::UCharBuffer* bpb) override ;
179+ USHORT read (Jrd::thread_db* tdbb, UCHAR * buff, USHORT len) override ;
180+ void write (Jrd::thread_db* tdbb, const UCHAR * buff, USHORT len) override ;
181+ void close (Jrd::thread_db* tdbb) override ;
182+ void cancel (Jrd::thread_db* tdbb) override ;
181183
182184private:
183185 InternalConnection& m_connection;
0 commit comments