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

fix addressof implementation

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-03-04 23:01:10 +09:00
parent 586c9972dc
commit 5b190c8b6e
9 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sprout/forward_clist.hpp
View file

@ -13,6 +13,7 @@
#include <sprout/config.hpp>
#include <sprout/workaround/std/cstddef.hpp>
#include <sprout/limits.hpp>
#include <sprout/memory/addressof.hpp>
#include <sprout/utility/move.hpp>
#include <sprout/utility/swap.hpp>
#include <sprout/utility/value_holder/value_holder.hpp>
@ -128,7 +129,7 @@ namespace sprout {
>::type
operator==(sprout::detail::forward_item_iterator<List1> const& lhs, sprout::detail::forward_item_iterator<List2> const& rhs) {
return !lhs.is_initialized() ? !rhs.is_initialized()
: rhs.is_initialized() && &*lhs == &*rhs
: rhs.is_initialized() && sprout::addressof(*lhs) == sprout::addressof(*rhs)
;
}
template<typename List1, typename List2>
@ -324,10 +325,10 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR forward_clist(InputIterator first, InputIterator last)
: fst()
{
item_holder_type* p = &fst.next;
item_holder_type* p = sprout::addressof(fst.next);
for (; first != last; ++first) {
*p = *first;
p = &(*p)->next;
p = sprout::addressof(*p)->next;
}
}
SPROUT_CXX14_CONSTEXPR forward_clist(forward_clist&& x)
@ -394,10 +395,10 @@ namespace sprout {
template<typename InputIterator>
SPROUT_CXX14_CONSTEXPR void push_front(InputIterator first, InputIterator last) {
item_holder_type nxt(fst.next);
item_holder_type* p = &fst.next;
item_holder_type* p = sprout::addressof(fst.next);
for (; first != last; ++first) {
*p = *first;
p = &(*p)->next;
p = sprout::addressof(*p)->next;
}
*p = nxt;
}
@ -417,10 +418,10 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR iterator insert_after(const_iterator position, InputIterator first, InputIterator last) {
item_holder_type nxt(position.item->next);
item_holder_type pos(position.item);
item_holder_type* p = &pos;
item_holder_type* p = sprout::addressof(pos);
for (; first != last; ++first) {
(*p)->next = *first;
p = &(*p)->next;
p = sprout::addressof(*p)->next;
}
(*p)->next = nxt;
return iterator(*p);
@ -453,7 +454,7 @@ namespace sprout {
SPROUT_CXX14_CONSTEXPR void unlink(item& x) {
for (iterator first = before_begin(), last = end(); first != last; ++first) {
iterator nxt = first.next();
if (nxt.item.get_pointer() == &x) {
if (nxt.item.get_pointer() == sprout::addressof(x)) {
first.item->next = sprout::move(nxt.item->next);
nxt.item->unlink();
break;