This commit is contained in:
bolero-MURAKAMI 2012-09-21 20:07:31 +09:00
parent 73ead93fe5
commit 69910ca06c
6 changed files with 21 additions and 9 deletions

View file

@ -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>¬
{

View file

@ -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>¬
{

View file

@ -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;
}
}

View file

@ -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;
}
};

View file

@ -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

View file

@ -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