Merge pull request #76 from kariya-mitsuru/fix-regression

fix regression
This commit is contained in:
Bolero MURAKAMI 2015-04-28 09:31:39 +09:00
commit a6629e1619
3 changed files with 7 additions and 1 deletions

View file

@ -55,7 +55,7 @@ namespace sprout {
InputIterator1 last1, InputIterator2 last2, Compare comp, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 ? current
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 || sprout::tuples::get<1>(current) == last2 ? current
: sprout::detail::find_symmetric_difference_impl(
sprout::detail::find_symmetric_difference_impl_1(
current,

View file

@ -18,6 +18,9 @@
#include <sprout/random/random_result.hpp>
#include <sprout/random/results.hpp>
#include <sprout/assert.hpp>
#ifdef SPROUT_WORKAROUND_NOT_TERMINATE_RECURSIVE_CONSTEXPR_FUNCTION_TEMPLATE
# include <sprout/workaround/recursive_function_template.hpp>
#endif
namespace sprout {
namespace random {

View file

@ -16,6 +16,9 @@
#include <sprout/random/random_result.hpp>
#include <sprout/random/results.hpp>
#include <sprout/assert.hpp>
#ifdef SPROUT_WORKAROUND_NOT_TERMINATE_RECURSIVE_CONSTEXPR_FUNCTION_TEMPLATE
# include <sprout/workaround/recursive_function_template.hpp>
#endif
namespace sprout {
namespace random {