King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-07-02 14:04:09 +00:00
Code Issues Releases Wiki Activity

bug fix

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
libs/algorithm/test/generate.cpp
View file

@ -11,7 +11,7 @@ namespace testspr {
static void algorithm_generate_test() { static void algorithm_generate_test() {
using namespace sprout; using namespace sprout;
{ {
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{0}}; SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
// <20><EFBFBD>¬ // <20><EFBFBD>¬
{ {

2
libs/algorithm/test/generate_n.cpp
View file

@ -11,7 +11,7 @@ namespace testspr {
static void algorithm_generate_n_test() { static void algorithm_generate_n_test() {
using namespace sprout; using namespace sprout;
{ {
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{0}}; SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{}};
// <20><EFBFBD>¬ // <20><EFBFBD>¬
{ {

8
sprout/iterator/filter_iterator.hpp
View file

@ -55,13 +55,13 @@ namespace sprout {
iterator_type last; iterator_type last;
predicate_type pred; predicate_type pred;
private: private:
iterator_type satisfy_predicate() { void satisfy_predicate() {
while (current != last && !pred(current)) { while (current != last && !pred(*current)) {
++current; ++current;
} }
} }
iterator_type satisfy_predicate_backward() { void satisfy_predicate_backward() {
while (!pred(current)) { while (!pred(*current)) {
--current; --current;
} }
} }

2
sprout/range/adaptor/replaced.hpp
View file

@ -29,7 +29,7 @@ namespace sprout {
: old_(old_value) : old_(old_value)
, new_(new_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; return (value == old_) ? new_ : value;
} }
}; };

4
sprout/range/adaptor/replaced_if.hpp
View file

@ -30,8 +30,8 @@ namespace sprout {
: pred_(pred) : pred_(pred)
, new_(new_value) , new_(new_value)
{} {}
T const& operator()(T const& value) const { SPROUT_CONSTEXPR T const& operator()(T const& value) const {
return pred(value) ? new_ : value; return pred_(value) ? new_ : value;
} }
}; };
} // namespace detail } // namespace detail

12
testspr/tools.hpp
View file

@ -67,6 +67,18 @@ namespace testspr {
public: public:
SPROUT_CONSTEXPR bool operator()(T const& t) const { return t % 2 != 0; } 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 // less