Skip to content

Commit f58cfa3

Browse files
asfernandesasfernandes
committed
Fix warnings using override in methods. Use final classes.
1 parent 7d28a48 commit f58cfa3

File tree

11 files changed

+1417
-1416
lines changed

11 files changed

+1417
-1416
lines changed

‎examples/dbcrypt/CryptApplication.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ using namespace Firebird;
3232
class CryptKey : public ICryptKeyCallbackImpl<CryptKey, CheckStatusWrapper>
3333
{
3434
public:
35-
unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer)
35+
unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer) override
3636
{
3737
if (length > 0 && buffer)
3838
{

‎examples/dbcrypt/CryptKeyHolder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class CryptKeyHolder : public IKeyHolderPluginImpl<CryptKeyHolder, CheckStatusWr
200200
name[sizeof(name) - 1] = 0;
201201
}
202202

203-
unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer)
203+
unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer) override
204204
{
205205
memcpy(buffer, &key, 1);
206206
return 1;

‎src/dsql/BoolNodes.h‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@ class BinaryBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_BINAR
3939

4040
static DmlNode* parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb, const UCHAR blrOp);
4141

42-
virtual void getChildren(NodeRefsHolder& holder, bool dsql) const
42+
void getChildren(NodeRefsHolder& holder, bool dsql) const override
4343
{
4444
BoolExprNode::getChildren(holder, dsql);
4545

4646
holder.add(arg1);
4747
holder.add(arg2);
4848
}
4949

50-
virtual Firebird::string internalPrint(NodePrinter& printer) const;
51-
virtual BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch);
52-
virtual void genBlr(DsqlCompilerScratch* dsqlScratch);
50+
Firebird::string internalPrint(NodePrinter& printer) const override;
51+
BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch) override;
52+
void genBlr(DsqlCompilerScratch* dsqlScratch) override;
5353

54-
virtual bool ignoreNulls(const StreamList& streams) const
54+
bool ignoreNulls(const StreamList& streams) const override
5555
{
5656
return (blrOp == blr_or) ?
5757
arg1->ignoreNulls(streams) && arg2->ignoreNulls(streams) :
5858
BoolExprNode::ignoreNulls(streams);
5959
}
6060

61-
virtual BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const;
62-
virtual bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const;
63-
virtual bool sameAs(const ExprNode* other, bool ignoreStreams) const;
64-
virtual bool execute(thread_db* tdbb, Request* request) const;
61+
BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const override;
62+
bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const override;
63+
bool sameAs(const ExprNode* other, bool ignoreStreams) const override;
64+
bool execute(thread_db* tdbb, Request* request) const override;
6565

6666
private:
67-
virtual bool executeAnd(thread_db* tdbb, Request* request) const;
68-
virtual bool executeOr(thread_db* tdbb, Request* request) const;
67+
bool executeAnd(thread_db* tdbb, Request* request) const;
68+
bool executeOr(thread_db* tdbb, Request* request) const;
6969

7070
public:
7171
UCHAR blrOp;
@@ -92,7 +92,7 @@ class ComparativeBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_
9292

9393
static DmlNode* parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb, const UCHAR blrOp);
9494

95-
virtual void getChildren(NodeRefsHolder& holder, bool dsql) const
95+
void getChildren(NodeRefsHolder& holder, bool dsql) const override
9696
{
9797
BoolExprNode::getChildren(holder, dsql);
9898

@@ -102,26 +102,26 @@ class ComparativeBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_
102102
holder.add(dsqlSpecialArg);
103103
}
104104

105-
virtual Firebird::string internalPrint(NodePrinter& printer) const;
106-
virtual BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch);
107-
virtual void genBlr(DsqlCompilerScratch* dsqlScratch);
105+
Firebird::string internalPrint(NodePrinter& printer) const override;
106+
BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch) override;
107+
void genBlr(DsqlCompilerScratch* dsqlScratch) override;
108108

109-
virtual bool possiblyUnknown() const
109+
bool possiblyUnknown() const override
110110
{
111111
return (blrOp == blr_equiv) ? true : BoolExprNode::possiblyUnknown();
112112
}
113113

114-
virtual bool ignoreNulls(const StreamList& streams) const
114+
bool ignoreNulls(const StreamList& streams) const override
115115
{
116116
return (blrOp == blr_equiv) ? false : BoolExprNode::ignoreNulls(streams);
117117
}
118118

119-
virtual BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const;
120-
virtual bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const;
121-
virtual bool sameAs(const ExprNode* other, bool ignoreStreams) const;
122-
virtual BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb);
123-
virtual void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process);
124-
virtual bool execute(thread_db* tdbb, Request* request) const;
119+
BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const override;
120+
bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const override;
121+
bool sameAs(const ExprNode* other, bool ignoreStreams) const override;
122+
BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb) override;
123+
void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process) override;
124+
bool execute(thread_db* tdbb, Request* request) const override;
125125

126126
private:
127127
bool stringBoolean(thread_db* tdbb, Request* request, dsc* desc1, dsc* desc2,
@@ -141,7 +141,7 @@ class ComparativeBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_
141141
};
142142

143143

144-
class InListBoolNode : public TypedNode<BoolExprNode, ExprNode::TYPE_IN_LIST_BOOL>
144+
class InListBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_IN_LIST_BOOL>
145145
{
146146
const static UCHAR blrOp = blr_in_list;
147147

@@ -204,30 +204,30 @@ class MissingBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_MISS
204204

205205
static DmlNode* parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb, const UCHAR blrOp);
206206

207-
virtual void getChildren(NodeRefsHolder& holder, bool dsql) const
207+
void getChildren(NodeRefsHolder& holder, bool dsql) const override
208208
{
209209
BoolExprNode::getChildren(holder, dsql);
210210
holder.add(arg);
211211
}
212212

213-
virtual Firebird::string internalPrint(NodePrinter& printer) const;
214-
virtual BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch);
215-
virtual void genBlr(DsqlCompilerScratch* dsqlScratch);
213+
Firebird::string internalPrint(NodePrinter& printer) const override;
214+
BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch) override;
215+
void genBlr(DsqlCompilerScratch* dsqlScratch) override;
216216

217-
virtual bool possiblyUnknown() const
217+
bool possiblyUnknown() const override
218218
{
219219
return true;
220220
}
221221

222-
virtual bool ignoreNulls(const StreamList& /*streams*/) const
222+
bool ignoreNulls(const StreamList& /*streams*/) const override
223223
{
224224
return false;
225225
}
226226

227-
virtual BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const;
228-
virtual BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb);
229-
virtual void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process);
230-
virtual bool execute(thread_db* tdbb, Request* request) const;
227+
BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const override;
228+
BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb) override;
229+
void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process) override;
230+
bool execute(thread_db* tdbb, Request* request) const override;
231231

232232
public:
233233
bool dsqlUnknown;
@@ -242,19 +242,19 @@ class NotBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_NOT_BOOL
242242

243243
static DmlNode* parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb, const UCHAR blrOp);
244244

245-
virtual void getChildren(NodeRefsHolder& holder, bool dsql) const
245+
void getChildren(NodeRefsHolder& holder, bool dsql) const override
246246
{
247247
BoolExprNode::getChildren(holder, dsql);
248248
holder.add(arg);
249249
}
250250

251-
virtual Firebird::string internalPrint(NodePrinter& printer) const;
252-
virtual BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch);
253-
virtual void genBlr(DsqlCompilerScratch* dsqlScratch);
251+
Firebird::string internalPrint(NodePrinter& printer) const override;
252+
BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch) override;
253+
void genBlr(DsqlCompilerScratch* dsqlScratch) override;
254254

255-
virtual BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const;
256-
virtual BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb);
257-
virtual bool execute(thread_db* tdbb, Request* request) const;
255+
BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const override;
256+
BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb) override;
257+
bool execute(thread_db* tdbb, Request* request) const override;
258258

259259
private:
260260
BoolExprNode* process(DsqlCompilerScratch* dsqlScratch, bool invert);
@@ -271,7 +271,7 @@ class RseBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_RSE_BOOL
271271

272272
static DmlNode* parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch* csb, const UCHAR blrOp);
273273

274-
virtual void getChildren(NodeRefsHolder& holder, bool dsql) const
274+
void getChildren(NodeRefsHolder& holder, bool dsql) const override
275275
{
276276
BoolExprNode::getChildren(holder, dsql);
277277

@@ -281,36 +281,36 @@ class RseBoolNode final : public TypedNode<BoolExprNode, ExprNode::TYPE_RSE_BOOL
281281
holder.add(rse);
282282
}
283283

284-
virtual Firebird::string internalPrint(NodePrinter& printer) const;
285-
virtual BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch);
286-
virtual void genBlr(DsqlCompilerScratch* dsqlScratch);
284+
Firebird::string internalPrint(NodePrinter& printer) const override;
285+
BoolExprNode* dsqlPass(DsqlCompilerScratch* dsqlScratch) override;
286+
void genBlr(DsqlCompilerScratch* dsqlScratch) override;
287287

288-
virtual bool dsqlAggregateFinder(AggregateFinder& visitor)
288+
bool dsqlAggregateFinder(AggregateFinder& visitor) override
289289
{
290290
return visitor.ignoreSubSelects ? false : BoolExprNode::dsqlAggregateFinder(visitor);
291291
}
292292

293-
virtual bool dsqlSubSelectFinder(SubSelectFinder& /*visitor*/)
293+
bool dsqlSubSelectFinder(SubSelectFinder& /*visitor*/) override
294294
{
295295
return true;
296296
}
297297

298-
virtual bool possiblyUnknown() const
298+
bool possiblyUnknown() const override
299299
{
300300
return true;
301301
}
302302

303-
virtual bool ignoreNulls(const StreamList& /*streams*/) const
303+
bool ignoreNulls(const StreamList& /*streams*/) const override
304304
{
305305
return false;
306306
}
307307

308-
virtual BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const;
309-
virtual bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const;
310-
virtual bool sameAs(const ExprNode* other, bool ignoreStreams) const;
311-
virtual BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb);
312-
virtual void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process);
313-
virtual bool execute(thread_db* tdbb, Request* request) const;
308+
BoolExprNode* copy(thread_db* tdbb, NodeCopier& copier) const override;
309+
bool dsqlMatch(DsqlCompilerScratch* dsqlScratch, const ExprNode* other, bool ignoreMapCast) const override;
310+
bool sameAs(const ExprNode* other, bool ignoreStreams) const override;
311+
BoolExprNode* pass1(thread_db* tdbb, CompilerScratch* csb) override;
312+
void pass2Boolean(thread_db* tdbb, CompilerScratch* csb, std::function<void ()> process) override;
313+
bool execute(thread_db* tdbb, Request* request) const override;
314314

315315
private:
316316
BoolExprNode* convertNeqAllToNotAny(thread_db* tdbb, CompilerScratch* csb);

0 commit comments

Comments
 (0)