Skip to content

Commit ab4b1d0

Browse files
committed
Fix wrong override of non-virtual method.
1 parent f58cfa3 commit ab4b1d0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/jrd/recsrc/RecordSource.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,11 +1215,6 @@ namespace Jrd
12151215
arg->nullRecords(tdbb);
12161216
}
12171217

1218-
protected:
1219-
const JoinType m_joinType;
1220-
const NestConst<BoolExprNode> m_boolean;
1221-
Firebird::Array<NestConst<Arg> > m_args;
1222-
12231218
void getLegacyPlan(thread_db* tdbb, Firebird::string& plan, unsigned level) const override
12241219
{
12251220
for (const auto& arg : m_args)
@@ -1231,7 +1226,8 @@ namespace Jrd
12311226
}
12321227
}
12331228

1234-
void getPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level, bool recurse) const
1229+
protected:
1230+
void internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsigned level, bool recurse) const override
12351231
{
12361232
if (recurse)
12371233
{
@@ -1264,6 +1260,11 @@ namespace Jrd
12641260

12651261
return "";
12661262
}
1263+
1264+
protected:
1265+
const JoinType m_joinType;
1266+
const NestConst<BoolExprNode> m_boolean;
1267+
Firebird::Array<NestConst<Arg>> m_args;
12671268
};
12681269

12691270
class NestedLoopJoin : public Join<RecordSource>

0 commit comments

Comments
 (0)