mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2024-11-12 21:09:01 +00:00
bug fix
This commit is contained in:
parent
73ead93fe5
commit
69910ca06c
6 changed files with 21 additions and 9 deletions
|
@ -11,7 +11,7 @@ namespace testspr {
|
|||
static void algorithm_generate_test() {
|
||||
using namespace sprout;
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{0}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
|
||||
|
||||
// <20>¶<EFBFBD>¬
|
||||
{
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace testspr {
|
|||
static void algorithm_generate_n_test() {
|
||||
using namespace sprout;
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{0}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
|
||||
|
||||
// <20>¶<EFBFBD>¬
|
||||
{
|
||||
|
|
|
@ -55,13 +55,13 @@ namespace sprout {
|
|||
iterator_type last;
|
||||
predicate_type pred;
|
||||
private:
|
||||
iterator_type satisfy_predicate() {
|
||||
while (current != last && !pred(current)) {
|
||||
void satisfy_predicate() {
|
||||
while (current != last && !pred(*current)) {
|
||||
++current;
|
||||
}
|
||||
}
|
||||
iterator_type satisfy_predicate_backward() {
|
||||
while (!pred(current)) {
|
||||
void satisfy_predicate_backward() {
|
||||
while (!pred(*current)) {
|
||||
--current;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ namespace sprout {
|
|||
: old_(old_value)
|
||||
, new_(new_value)
|
||||
{}
|
||||
T const& operator()(T const& value) const {
|
||||
SPROUT_CONSTEXPR T const& operator()(T const& value) const {
|
||||
return (value == old_) ? new_ : value;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -30,8 +30,8 @@ namespace sprout {
|
|||
: pred_(pred)
|
||||
, new_(new_value)
|
||||
{}
|
||||
T const& operator()(T const& value) const {
|
||||
return pred(value) ? new_ : value;
|
||||
SPROUT_CONSTEXPR T const& operator()(T const& value) const {
|
||||
return pred_(value) ? new_ : value;
|
||||
}
|
||||
};
|
||||
} // namespace detail
|
||||
|
|
|
@ -67,6 +67,18 @@ namespace testspr {
|
|||
public:
|
||||
SPROUT_CONSTEXPR bool operator()(T const& t) const { return t % 2 != 0; }
|
||||
};
|
||||
//
|
||||
// is_multiple_of
|
||||
//
|
||||
template<typename T, typename U = T>
|
||||
struct is_multiple_of {
|
||||
public:
|
||||
typedef T first_argument_type;
|
||||
typedef U second_argument_type;
|
||||
typedef bool result_type;
|
||||
public:
|
||||
SPROUT_CONSTEXPR bool operator()(T const& t, U const& u) const { return t % u == 0; }
|
||||
};
|
||||
|
||||
//
|
||||
// less
|
||||
|
|
Loading…
Reference in a new issue