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

diff --git a/source/condition.h b/source/condition.h
index 163c9c8..bbabf22 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -20,7 +20,7 @@ public:
 	virtual Condition *clone() const = 0;
 	virtual Condition *flatten() const { return clone(); }
 	virtual bool can_merge(const Condition &, const CompoundCondition &) const { return false; }
-	virtual Condition *merge(const std::vector<Condition *> &, const CompoundCondition &) const { return 0; }
+	virtual Condition *merge(const std::vector<const Condition *> &, const CompoundCondition &) const { return 0; }
 	virtual bool is_viable() const { return true; }
 	virtual void add_lines(std::list<FilterStatement> &) const = 0;
 };
@@ -43,7 +43,7 @@ protected:
 public:
 	void add(Condition *);
 	unsigned count() const { return conditions.size(); }
-	const Condition *get(unsigned) const;
+	const Condition &get(unsigned) const;
 
 	virtual Condition *flatten() const;
 protected: