mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-12 14:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[sprout.iterator] fix predefined iterators: support c++14 constexpr

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-10-09 23:44:25 +09:00
parent 40b95948a9
commit 9e678c517d
29 changed files with 290 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sprout/iterator/insert_iterator.hpp
View file

@ -52,7 +52,9 @@ namespace sprout {
using base_type::container;
iterator iter;
public:
SPROUT_CONSTEXPR insert_iterator() = default;
SPROUT_CONSTEXPR insert_iterator()
: base_type(), iter()
{}
SPROUT_CONSTEXPR insert_iterator(param_type x, iterator pos)
: base_type(x), iter(pos)
{}
@ -60,28 +62,25 @@ namespace sprout {
SPROUT_CONSTEXPR iterator position() const {
return iter;
}
insert_iterator& operator=(typename container_type::value_type const& value) {
SPROUT_CXX14_CONSTEXPR insert_iterator& operator=(typename container_type::value_type const& value) {
container->insert(iter, value);
return *this;
}
insert_iterator& operator=(typename container_type::value_type&& value) {
SPROUT_CXX14_CONSTEXPR insert_iterator& operator=(typename container_type::value_type&& value) {
container->insert(iter, sprout::move(value));
return *this;
}
SPROUT_CONSTEXPR insert_iterator const& operator*() const {
SPROUT_CXX14_CONSTEXPR insert_iterator& operator*() {
return *this;
}
insert_iterator& operator*() {
SPROUT_CXX14_CONSTEXPR insert_iterator& operator++() {
return *this;
}
insert_iterator& operator++() {
return *this;
}
insert_iterator operator++(int) {
SPROUT_CXX14_CONSTEXPR insert_iterator operator++(int) {
return *this;
}
void swap(insert_iterator& other)
SPROUT_CXX14_CONSTEXPR void swap(insert_iterator& other)
SPROUT_NOEXCEPT_EXPR(
SPROUT_NOEXCEPT_EXPR(base_type::swap(other))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(other.iter, iter))
@ -96,7 +95,7 @@ namespace sprout {
// swap
//
template<typename Container>
inline void
inline SPROUT_CXX14_CONSTEXPR void
swap(sprout::insert_iterator<Container>& lhs, sprout::insert_iterator<Container>& rhs)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(lhs.swap(rhs)))
{