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 | 9c9ba8954358f791a818b3eefda2c0eb805bbd97 (patch) | |
| tree | 0153350406bf1c9c6aafa8e5da5d4b3feb9cd0c9 /klm/util/multi_intersection.hh | |
| parent | 1b0d40959f529b67db3b9d10dbf93101e0c65c7c (diff) | |
| parent | 19de646f60d4fb52ddd26d25e06f50f8717fd988 (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); } } |