]> git.tdb.fi Git - poefilter.git/commit
Make the helper functions in CompoundCondition static
authorMikko Rasa <tdb@tdb.fi>
Fri, 17 Aug 2018 17:23:02 +0000 (20:23 +0300)
committerMikko Rasa <tdb@tdb.fi>
Fri, 17 Aug 2018 17:23:02 +0000 (20:23 +0300)
commit8dcb2ed5219429c1c7d543c422a7471c18917f55
treedceaf1305979ea1a87a00f976b08344e036b0b2a
parent746329e61ac9f26962af740b0b11dee716803521
Make the helper functions in CompoundCondition static

Merge_two now takes an explicit parent parameter to fix an inconsistency
between the can_merge call from add_merged_to and the actual merge call
in merge_two.
source/condition.cpp
source/condition.h