mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2024-11-14 10:39:05 +00:00
Merge pull request #76 from kariya-mitsuru/fix-regression
fix regression
This commit is contained in:
commit
a6629e1619
3 changed files with 7 additions and 1 deletions
|
@ -55,7 +55,7 @@ namespace sprout {
|
||||||
InputIterator1 last1, InputIterator2 last2, Compare comp, typename std::iterator_traits<InputIterator1>::difference_type n
|
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(
|
||||||
sprout::detail::find_symmetric_difference_impl_1(
|
sprout::detail::find_symmetric_difference_impl_1(
|
||||||
current,
|
current,
|
||||||
|
|
|
@ -18,6 +18,9 @@
|
||||||
#include <sprout/random/random_result.hpp>
|
#include <sprout/random/random_result.hpp>
|
||||||
#include <sprout/random/results.hpp>
|
#include <sprout/random/results.hpp>
|
||||||
#include <sprout/assert.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 sprout {
|
||||||
namespace random {
|
namespace random {
|
||||||
|
|
|
@ -16,6 +16,9 @@
|
||||||
#include <sprout/random/random_result.hpp>
|
#include <sprout/random/random_result.hpp>
|
||||||
#include <sprout/random/results.hpp>
|
#include <sprout/random/results.hpp>
|
||||||
#include <sprout/assert.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 sprout {
|
||||||
namespace random {
|
namespace random {
|
||||||
|
|
Loading…
Reference in a new issue