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 optional

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-10-23 23:10:52 +09:00
parent 8cb432dee1
commit 410a8af026
3 changed files with 72 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprout/optional/get.hpp
View file

@ -21,12 +21,12 @@ namespace sprout {
template<typename T> template<typename T>
inline SPROUT_CONSTEXPR typename sprout::optional<T>::pointer_const_type inline SPROUT_CONSTEXPR typename sprout::optional<T>::pointer_const_type
get(sprout::optional<T> const* x) { get(sprout::optional<T> const* x) {
return x->get_ptr(); return x->get_pointer();
} }
template<typename T> template<typename T>
inline typename sprout::optional<T>::pointer_type inline typename sprout::optional<T>::pointer_type
get(sprout::optional<T>* x) { get(sprout::optional<T>* x) {
return x->get_ptr(); return x->get_pointer();
} }
// //

2
sprout/optional/optional.hpp
View file

@ -108,6 +108,7 @@ namespace sprout {
void swap(optional& other) void swap(optional& other)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::swap(storage_, other.storage_))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::swap(storage_, other.storage_)))
{ {
sprout::swap(initialized_, other.initialized_);
sprout::swap(storage_, other.storage_); sprout::swap(storage_, other.storage_);
} }
@ -180,7 +181,6 @@ namespace sprout {
{ {
lhs.swap(rhs); lhs.swap(rhs);
} }
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_OPTIONAL_OPTIONAL_HPP #endif // #ifndef SPROUT_OPTIONAL_OPTIONAL_HPP

72
sprout/utility/value_holder.hpp
View file

@ -2,6 +2,7 @@
#define SPROUT_UTILITY_VALUE_HOLDER_HPP #define SPROUT_UTILITY_VALUE_HOLDER_HPP
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/utility/swap.hpp>
namespace sprout { namespace sprout {
namespace detail { namespace detail {
@ -130,29 +131,45 @@ namespace sprout {
typedef typename helper_type::mutable_or_const_pointer mutable_or_const_pointer; typedef typename helper_type::mutable_or_const_pointer mutable_or_const_pointer;
typedef typename helper_type::param_type param_type; typedef typename helper_type::param_type param_type;
typedef reference reference_type; typedef reference reference_type;
typedef const_reference reference_const_type; typedef mutable_or_const_reference reference_const_type;
typedef pointer pointer_type; typedef pointer pointer_type;
typedef const_pointer pointer_const_type; typedef mutable_or_const_pointer pointer_const_type;
typedef param_type argument_type; typedef param_type argument_type;
private: private:
holder_type holder_; holder_type holder_;
public: public:
value_holder() = default; value_holder() = default;
value_holder(value_holder const&) = default;
explicit SPROUT_CONSTEXPR value_holder(param_type p) explicit SPROUT_CONSTEXPR value_holder(param_type p)
: holder_(helper_type::hold(p)) : holder_(helper_type::hold(p))
{} {}
void swap(value_holder& other)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::swap(holder_, other.holder_)))
{
sprout::swap(holder_, other.holder_);
}
operator reference() { operator reference() {
return helper_type::ref(holder_); return helper_type::ref(holder_);
} }
SPROUT_CONSTEXPR operator const_reference() const { SPROUT_CONSTEXPR operator mutable_or_const_reference() const {
return helper_type::ref(holder_); return helper_type::ref(holder_);
} }
pointer operator->() {
return helper_type::ptr(holder_);
}
SPROUT_CONSTEXPR mutable_or_const_pointer operator->() const {
return helper_type::ptr(holder_);
}
reference get() { reference get() {
return helper_type::ref(holder_); return helper_type::ref(holder_);
} }
SPROUT_CONSTEXPR mutable_or_const_reference get() const { SPROUT_CONSTEXPR mutable_or_const_reference get() const {
return helper_type::ref(holder_); return helper_type::ref(holder_);
} }
pointer get_pointer() { pointer get_pointer() {
return helper_type::ptr(holder_); return helper_type::ptr(holder_);
} }
@ -166,6 +183,55 @@ namespace sprout {
return get_pointer(); return get_pointer();
} }
}; };
//
// swap
//
template<typename T>
inline void
swap(sprout::value_holder<T>& lhs, sprout::value_holder<T>& rhs)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(lhs.swap(rhs)))
{
lhs.swap(rhs);
}
//
// get
//
template<typename T>
inline SPROUT_CONSTEXPR typename sprout::value_holder<T>::reference_const_type
get(sprout::value_holder<T> const& x) {
return x.get();
}
template<typename T>
inline typename sprout::value_holder<T>::reference_type
get(sprout::value_holder<T>& x) {
return x.get();
}
template<typename T>
inline SPROUT_CONSTEXPR typename sprout::value_holder<T>::pointer_const_type
get(sprout::value_holder<T> const* x) {
return x->get_pointer();
}
template<typename T>
inline typename sprout::value_holder<T>::pointer_type
get(sprout::value_holder<T>* x) {
return x->get_pointer();
}
//
// get_pointer
//
template<typename T>
inline SPROUT_CONSTEXPR typename sprout::value_holder<T>::pointer_const_type
get_pointer(sprout::value_holder<T> const& x) {
return x.get_pointer();
}
template<typename T>
inline typename sprout::value_holder<T>::pointer_type
get_pointer(sprout::value_holder<T>& x) {
return x.get_pointer();
}
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_UTILITY_VALUE_HOLDER_HPP #endif // #ifndef SPROUT_UTILITY_VALUE_HOLDER_HPP