X-Git-Url: http://git.tdb.fi/?p=poefilter.git;a=blobdiff_plain;f=source%2Fcondition.h;h=af8aa95faa282c364c515111eb93e33dad6c061e;hp=bbabf22e5f27d98c8de47b0b4a58622a910dff63;hb=8dcb2ed5219429c1c7d543c422a7471c18917f55;hpb=746329e61ac9f26962af740b0b11dee716803521

diff --git a/source/condition.h b/source/condition.h
index bbabf22..af8aa95 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -48,9 +48,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;
+	static Condition *merge_two(Condition *, Condition *, const CompoundCondition &, bool);
+	static Condition *add_merged_to(Condition *, CompoundCondition *, bool);
+	static Condition *merge_contents_to(CompoundCondition *, CompoundCondition *);
 	virtual Condition *flatten(Condition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, Condition *) const = 0;
 	virtual Condition *flatten(AndCondition *, AndCondition *) const = 0;