boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-25 01:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: comma in BOOST_STATIC_ASSERT

Browse Source
This commit is contained in:
Andrzej Krzemienski
2014-06-15 21:51:07 +02:00
parent 31c9119266
commit 0a2a8957fa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/optional/optional.hpp
View File

@ -1062,28 +1062,28 @@ class optional : public optional_detail::optional_base<T>
template <class U> template <class U>
value_type value_or ( U&& v ) const& value_type value_or ( U&& v ) const&
{ {
BOOST_STATIC_ASSERT(is_convertible<U&&, value_type>::value); BOOST_STATIC_ASSERT((is_convertible<U&&, value_type>::value));
return this->is_initialized() ? get() : static_cast<value_type>(boost::forward<U>(v)); return this->is_initialized() ? get() : static_cast<value_type>(boost::forward<U>(v));
} }
template <class U> template <class U>
value_type value_or ( U&& v ) && value_type value_or ( U&& v ) &&
{ {
BOOST_STATIC_ASSERT(is_convertible<U&&, value_type>::value); BOOST_STATIC_ASSERT((is_convertible<U&&, value_type>::value));
return this->is_initialized() ? boost::move(get()) : static_cast<value_type>(boost::forward<U>(v)); return this->is_initialized() ? boost::move(get()) : static_cast<value_type>(boost::forward<U>(v));
} }
#elif !defined BOOST_NO_CXX11_RVALUE_REFERENCES #elif !defined BOOST_NO_CXX11_RVALUE_REFERENCES
template <class U> template <class U>
value_type value_or ( U&& v ) const value_type value_or ( U&& v ) const
{ {
BOOST_STATIC_ASSERT(is_convertible<U&&, value_type>::value); BOOST_STATIC_ASSERT((is_convertible<U&&, value_type>::value));
return this->is_initialized() ? get() : static_cast<value_type>(boost::forward<U>(v)); return this->is_initialized() ? get() : static_cast<value_type>(boost::forward<U>(v));
} }
#else #else
template <class U> template <class U>
value_type value_or ( U const& v ) const value_type value_or ( U const& v ) const
{ {
BOOST_STATIC_ASSERT(is_convertible<U const&, value_type>::value); BOOST_STATIC_ASSERT((is_convertible<U const&, value_type>::value));
return this->is_initialized() ? get() : static_cast<value_type>(v); return this->is_initialized() ? get() : static_cast<value_type>(v);
} }
#endif #endif