diff options
author | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
commit | c83f665cb7efbbfb0fdfa12203b09ba60e365d25 (patch) | |
tree | d9132aaf35e696a52c5e09430ae2889b033cdacb /klm/util/multi_intersection.hh | |
parent | 85088dc6e09d4e91038aea46e8d20b5c34053b5f (diff) | |
parent | 3e22fcc3569a2855f691be4e3ee81f644b926c04 (diff) |
resolv conflict in mira
Diffstat (limited to 'klm/util/multi_intersection.hh')
-rw-r--r-- | klm/util/multi_intersection.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/klm/util/multi_intersection.hh b/klm/util/multi_intersection.hh index 8334d39d..04678352 100644 --- a/klm/util/multi_intersection.hh +++ b/klm/util/multi_intersection.hh @@ -66,7 +66,7 @@ template <class Iterator, class Output, class Less> void AllIntersection(std::ve std::sort(sets.begin(), sets.end(), detail::RangeLessBySize<boost::iterator_range<Iterator> >()); boost::optional<Value> ret; - for (boost::optional<Value> ret; ret = detail::FirstIntersectionSorted(sets, less); sets.front().advance_begin(1)) { + for (boost::optional<Value> ret; (ret = detail::FirstIntersectionSorted(sets, less)); sets.front().advance_begin(1)) { out(*ret); } } |