mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-05-12 09:33:30 +00:00
remove warning
This commit is contained in:
parent
12e72dbf7e
commit
705773a03a
4 changed files with 78 additions and 78 deletions
|
@ -28,7 +28,7 @@ namespace sprout {
|
||||||
int found
|
int found
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return found < 0 || found == 2 && size1 < size2;
|
return found < 0 || (found == 2 && size1 < size2);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename Compare>
|
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename Compare>
|
||||||
|
|
|
@ -131,7 +131,7 @@ namespace sprout {
|
||||||
: size == 1
|
: size == 1
|
||||||
? !comp(*first2, delim2) && !comp(delim2, *first2)
|
? !comp(*first2, delim2) && !comp(delim2, *first2)
|
||||||
? !comp(*first1, delim1) && !comp(delim1, *first1) ? 0 : 1
|
? !comp(*first1, delim1) && !comp(delim1, *first1) ? 0 : 1
|
||||||
: !comp(*first1, delim1) && !comp(delim1, *first1) || comp(*first1, *first2)
|
: (!comp(*first1, delim1) && !comp(delim1, *first1)) || comp(*first1, *first2)
|
||||||
? -1
|
? -1
|
||||||
: comp(*first2, *first1) ? 1 : 2
|
: comp(*first2, *first1) ? 1 : 2
|
||||||
: sprout::detail::tristate_lexicographical_compare_2_impl_ra(
|
: sprout::detail::tristate_lexicographical_compare_2_impl_ra(
|
||||||
|
@ -180,7 +180,7 @@ namespace sprout {
|
||||||
: n == 1
|
: n == 1
|
||||||
? !comp(*current.second, delim2) && !comp(delim2, *current.second)
|
? !comp(*current.second, delim2) && !comp(delim2, *current.second)
|
||||||
? type(!comp(*current.first, delim1) && !comp(delim1, *current.first) ? last1 : current.first, last2)
|
? type(!comp(*current.first, delim1) && !comp(delim1, *current.first) ? last1 : current.first, last2)
|
||||||
: !comp(*current.first, delim1) && !comp(delim1, *current.first) || comp(*current.first, *current.second)
|
: (!comp(*current.first, delim1) && !comp(delim1, *current.first)) || comp(*current.first, *current.second)
|
||||||
? type(last1, current.second)
|
? type(last1, current.second)
|
||||||
: comp(*current.second, *current.first) ? type(current.first, last2)
|
: comp(*current.second, *current.first) ? type(current.first, last2)
|
||||||
: type(sprout::next(current.first), sprout::next(current.second))
|
: type(sprout::next(current.first), sprout::next(current.second))
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
=============================================================================*/
|
=============================================================================*/
|
||||||
#ifndef SPROUT_BIT_ISOLS1B_HPP
|
#ifndef SPROUT_BIT_ISOLS1B_HPP
|
||||||
#define SPROUT_BIT_RSTLS1B_HPP
|
#define SPROUT_BIT_ISOLS1B_HPP
|
||||||
|
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <sprout/config.hpp>
|
#include <sprout/config.hpp>
|
||||||
|
@ -25,4 +25,4 @@ namespace sprout {
|
||||||
}
|
}
|
||||||
} // namespace sprout
|
} // namespace sprout
|
||||||
|
|
||||||
#endif // #ifndef SPROUT_BIT_RSTLS1B_HPP
|
#endif // #ifndef SPROUT_BIT_ISOLS1B_HPP
|
||||||
|
|
Loading…
Add table
Reference in a new issue