mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: sub_array - support STL container

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-01-14 01:33:54 +09:00
parent d99a7d1436
commit ace6acad69
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sprout/pit/pit.hpp
View file

@ -19,21 +19,23 @@ namespace sprout {
class pit class pit
: public sprout::container_traits_facade<Container> : public sprout::container_traits_facade<Container>
{ {
private:
typedef sprout::container_traits_facade<typename std::remove_reference<Container>::type> facade_type;
public: public:
typedef Container container_type; typedef Container container_type;
typedef typename sprout::container_traits_facade<Container>::value_type value_type; typedef typename facade_type::value_type value_type;
typedef typename sprout::container_traits_facade<Container>::reference reference; typedef typename facade_type::reference reference;
typedef typename sprout::container_traits_facade<Container>::const_reference const_reference; typedef typename facade_type::const_reference const_reference;
typedef typename sprout::value_iterator<reference> iterator; typedef typename sprout::value_iterator<reference> iterator;
typedef typename sprout::value_iterator<const_reference> const_iterator; typedef typename sprout::value_iterator<const_reference> const_iterator;
typedef typename sprout::container_traits_facade<Container>::size_type size_type; typedef typename facade_type::size_type size_type;
typedef typename sprout::container_traits_facade<Container>::difference_type difference_type; typedef typename facade_type::difference_type difference_type;
typedef typename sprout::container_traits_facade<Container>::pointer pointer; typedef typename facade_type::pointer pointer;
typedef typename sprout::container_traits_facade<Container>::const_pointer const_pointer; typedef typename facade_type::const_pointer const_pointer;
typedef typename sprout::reverse_iterator<iterator> reverse_iterator; typedef typename sprout::reverse_iterator<iterator> reverse_iterator;
typedef typename sprout::reverse_iterator<const_iterator> const_reverse_iterator; typedef typename sprout::reverse_iterator<const_iterator> const_reverse_iterator;
public: public:
SPROUT_STATIC_CONSTEXPR size_type enumerable_size = sprout::detail::static_size_or_zero<sprout::container_traits_facade<Container> >::value; SPROUT_STATIC_CONSTEXPR size_type enumerable_size = sprout::detail::static_size_or_zero<facade_type>::value;
public: public:
value_type elem; value_type elem;
public: public:

12
sprout/sub_array/sub_array.hpp
View file

@ -185,7 +185,7 @@ namespace sprout {
typedef typename facade_type::pointer pointer; typedef typename facade_type::pointer pointer;
typedef typename facade_type::const_pointer const_pointer; typedef typename facade_type::const_pointer const_pointer;
public: public:
SPROUT_STATIC_CONSTEXPR size_type static_size = facade_type::static_size; SPROUT_STATIC_CONSTEXPR size_type enumerable_size = sprout::detail::static_size_or_zero<facade_type>::value;
public: public:
typedef typename impl_type::holder_type holder_type; typedef typename impl_type::holder_type holder_type;
typedef typename impl_type::param_type param_type; typedef typename impl_type::param_type param_type;
@ -203,7 +203,7 @@ namespace sprout {
: impl_type( : impl_type(
array_tag(), array_tag(),
arr, arr,
sprout::index_range<0, static_size>::make(), sprout::index_range<0, enumerable_size>::make(),
first, first,
last last
) )
@ -212,7 +212,7 @@ namespace sprout {
: impl_type( : impl_type(
array_tag(), array_tag(),
arr, arr,
sprout::index_range<0, static_size>::make(), sprout::index_range<0, enumerable_size>::make(),
first, first,
last last
) )
@ -221,7 +221,7 @@ namespace sprout {
: impl_type( : impl_type(
array_tag(), array_tag(),
impl_type::template to_param<Container>(other.array_), impl_type::template to_param<Container>(other.array_),
sprout::index_range<0, static_size>::make(), sprout::index_range<0, enumerable_size>::make(),
sprout::distance(sprout::begin(other.get_array()), first), sprout::distance(sprout::begin(other.get_array()), first),
sprout::distance(sprout::begin(other.get_array()), last) sprout::distance(sprout::begin(other.get_array()), last)
) )
@ -230,7 +230,7 @@ namespace sprout {
: impl_type( : impl_type(
array_tag(), array_tag(),
impl_type::template to_param<Container>(other.array_), impl_type::template to_param<Container>(other.array_),
sprout::index_range<0, static_size>::make(), sprout::index_range<0, enumerable_size>::make(),
first + other.first_, first + other.first_,
last + other.first_ last + other.first_
) )
@ -355,7 +355,7 @@ namespace sprout {
} }
}; };
template<typename Container> template<typename Container>
SPROUT_CONSTEXPR_OR_CONST typename sprout::sub_array<Container>::size_type sprout::sub_array<Container>::static_size; SPROUT_CONSTEXPR_OR_CONST typename sprout::sub_array<Container>::size_type sprout::sub_array<Container>::enumerable_size;
// //
// swap // swap