mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-14 15:04:09 +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

18
sprout/iterator/square_iterator.hpp
View file

@ -84,7 +84,7 @@ namespace sprout {
, duty_(it.duty_)
{}
template<typename U>
square_iterator& operator=(square_iterator<U> const& it) {
SPROUT_CXX14_CONSTEXPR square_iterator& operator=(square_iterator<U> const& it) {
square_iterator temp(it);
temp.swap(*this);
return *this;
@ -112,20 +112,20 @@ namespace sprout {
SPROUT_CONSTEXPR pointer operator->() const {
return &operator*()();
}
square_iterator& operator++() {
SPROUT_CXX14_CONSTEXPR square_iterator& operator++() {
++index_;
return *this;
}
square_iterator operator++(int) {
SPROUT_CXX14_CONSTEXPR square_iterator operator++(int) {
square_iterator result(*this);
++index_;
return result;
}
square_iterator& operator--() {
SPROUT_CXX14_CONSTEXPR square_iterator& operator--() {
--index_;
return *this;
}
square_iterator operator--(int) {
SPROUT_CXX14_CONSTEXPR square_iterator operator--(int) {
square_iterator temp(*this);
--index_;
return temp;
@ -136,12 +136,12 @@ namespace sprout {
SPROUT_CONSTEXPR square_iterator operator-(difference_type n) const {
return square_iterator(*this, index_ - n);
}
square_iterator& operator+=(difference_type n) {
SPROUT_CXX14_CONSTEXPR square_iterator& operator+=(difference_type n) {
square_iterator temp(*this, index_ + n);
temp.swap(*this);
return *this;
}
square_iterator& operator-=(difference_type n) {
SPROUT_CXX14_CONSTEXPR square_iterator& operator-=(difference_type n) {
square_iterator temp(*this, index_ - n);
temp.swap(*this);
return *this;
@ -157,7 +157,7 @@ namespace sprout {
SPROUT_CONSTEXPR square_iterator prev() const {
return square_iterator(*this, index_ - 1);
}
void swap(square_iterator& other) SPROUT_NOEXCEPT {
SPROUT_CXX14_CONSTEXPR void swap(square_iterator& other) SPROUT_NOEXCEPT {
sprout::swap(index_, other.index_);
sprout::swap(frequency_, other.frequency_);
sprout::swap(amplitude_, other.amplitude_);
@ -211,7 +211,7 @@ namespace sprout {
// swap
//
template<typename Value>
inline void
inline SPROUT_CXX14_CONSTEXPR void
swap(sprout::square_iterator<Value>& lhs, sprout::square_iterator<Value>& rhs)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(lhs.swap(rhs)))
{