summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-06-20 14:19:11 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-06-20 14:19:11 +0000
commit3c720effede799a8aed52b25dde45fb8b43acebf (patch)
treec4b6f0b2a350e7b3aaad031635b9dac745bb4395 /searchcore
parentce6498d13072345e69478f1fa86b04ac198316e0 (diff)
Rename NonFinal to Base after feedback from havardpe.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/querynodes.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
index bf060507b01..b0f844b779c 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
@@ -76,7 +76,7 @@ uint32_t numTerms<search::query::Phrase>(const search::query::Phrase &n) {
} // namespace proton::matching::<unnamed>
template <typename Base>
-struct ProtonTermNonFinal : public Base,
+struct ProtonTermBase : public Base,
public ProtonTermData
{
using Base::Base;
@@ -96,8 +96,8 @@ struct ProtonTermNonFinal : public Base,
};
template <typename Base>
-struct ProtonTerm : public ProtonTermNonFinal<Base> {
- using ProtonTermNonFinal<Base>::ProtonTermNonFinal;
+struct ProtonTerm : public ProtonTermBase<Base> {
+ using ProtonTermBase<Base>::ProtonTermBase;
};
typedef search::query::SimpleAnd ProtonAnd;
@@ -108,10 +108,10 @@ typedef search::query::SimpleOr ProtonOr;
typedef search::query::SimpleRank ProtonRank;
typedef search::query::SimpleWeakAnd ProtonWeakAnd;
-struct ProtonEquiv final : public ProtonTermNonFinal<search::query::Equiv>
+struct ProtonEquiv final : public ProtonTermBase<search::query::Equiv>
{
search::fef::MatchDataLayout children_mdl;
- using ProtonTermNonFinal::ProtonTermNonFinal;
+ using ProtonTermBase::ProtonTermBase;
};
typedef ProtonTerm<search::query::LocationTerm> ProtonLocationTerm;