mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-05-10 09:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix sub_array::get_array()

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-04-14 17:00:28 +09:00
parent 89734c0b09
commit d082fa743b
1 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sprout/sub_array/sub_array.hpp
View file

@ -104,6 +104,41 @@ namespace sprout {
>::type to_const_param(holder_type const& arr) { >::type to_const_param(holder_type const& arr) {
return arr; return arr;
} }
template<typename Arr>
static SPROUT_CONSTEXPR typename std::enable_if<
std::is_reference<Arr>::value,
internal_type&
>::type to_held(holder_type arr) {
return *arr;
}
template<typename Arr>
static SPROUT_CONSTEXPR typename std::enable_if<
!std::is_reference<Arr>::value,
internal_type&
>::type to_held(holder_type& arr) {
return arr;
}
template<typename Arr>
static SPROUT_CONSTEXPR typename std::enable_if<
!std::is_reference<Arr>::value,
internal_type const&
>::type to_held(holder_type const& arr) {
return arr;
}
template<typename Arr>
static SPROUT_CONSTEXPR typename std::enable_if<
std::is_reference<Arr>::value,
internal_type const&
>::type to_const_held(holder_type arr) {
return *arr;
}
template<typename Arr>
static SPROUT_CONSTEXPR typename std::enable_if<
!std::is_reference<Arr>::value,
internal_type const&
>::type to_const_held(holder_type const& arr) {
return arr;
}
protected: protected:
holder_type array_; holder_type array_;
impl_difference_type to_first_; impl_difference_type to_first_;
@ -356,17 +391,17 @@ namespace sprout {
} }
} }
SPROUT_CXX14_CONSTEXPR param_type get_internal() { SPROUT_CXX14_CONSTEXPR internal_type& get_internal() {
return impl_type::template to_param<Container>(array_); return impl_type::template to_held<Container>(array_);
} }
SPROUT_CONSTEXPR const_param_type get_internal() const { SPROUT_CONSTEXPR internal_type const& get_internal() const {
return impl_type::template to_const_param<Container>(array_); return impl_type::template to_const_held<Container>(array_);
} }
param_type get_array() { SPROUT_CXX14_CONSTEXPR internal_type& get_array() {
return impl_type::template to_param<Container>(array_); return impl_type::template to_held<Container>(array_);
} }
SPROUT_CONSTEXPR const_param_type get_array() const { SPROUT_CONSTEXPR internal_type const& get_array() const {
return impl_type::template to_const_param<Container>(array_); return impl_type::template to_const_held<Container>(array_);
} }
SPROUT_CONSTEXPR difference_type to_first() const { SPROUT_CONSTEXPR difference_type to_first() const {
return to_first_; return to_first_;