X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.h;h=979f1e904714032788a8daf1d850568c713f353e;hb=694d2890065b1555a01a81994cb80f106ca577ee;hp=141e57094cfd666a3b789b889329dbec50b2c1ed;hpb=8b9d1f472e7bfbb1e097bb6d8bcad026e9636822;p=poefilter.git

diff --git a/source/condition.h b/source/condition.h
index 141e570..979f1e9 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -47,6 +47,9 @@ public:
 	virtual Condition *flatten() const;
 protected:
 	Condition *dispatch_flatten(Condition *, Condition *) const;
+	Condition *merge_two(Condition *, Condition *, bool) const;
+	Condition *add_merged_to(Condition *, CompoundCondition *, bool) const;
+	Condition *merge_contents_to(CompoundCondition *, CompoundCondition *) const;
 	virtual Condition *flatten(Condition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, AndCondition *) const = 0;