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

Fixed code, updated docs, added emplace()

Browse Source
This commit is contained in:
Andrzej Krzemienski
2014-06-03 17:36:18 +02:00
parent 22baf1dd09
commit 2e583aaf30
23 changed files with 986 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/detail/none_t.hpp
View File

@ -1,28 +0,0 @@
// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
//
// Use, modification, and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/optional for documentation.
//
// You are welcome to contact the author at:
// fernando_cacciola@hotmail.com
//
#ifndef BOOST_DETAIL_NONE_T_17SEP2003_HPP
#define BOOST_DETAIL_NONE_T_17SEP2003_HPP
namespace boost {
namespace detail {
struct none_helper{};
typedef int none_helper::*none_t ;
} // namespace detail
} // namespace boost
#endif

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

@ -460,14 +460,26 @@ class optional_base : public optional_tag
void construct ( argument_type val )
{
new (m_storage.address()) internal_type(val) ;
::new (m_storage.address()) internal_type(val) ;
m_initialized = true ;
}
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
void construct ( rval_reference_type val )
{
new (m_storage.address()) internal_type( types::move(val) ) ;
::new (m_storage.address()) internal_type( types::move(val) ) ;
m_initialized = true ;
}
#endif
#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
// Constructs in-place
// upon exception *this is always uninitialized
template<class... Args>
void emplace_assign ( Args&&... args )
{
destroy();
::new (m_storage.address()) internal_type( boost::forward<Args>(args)... );
m_initialized = true ;
}
#endif
@ -507,6 +519,7 @@ class optional_base : public optional_tag
destroy();
construct(factory,tag);
}
#else
// Constructs in-place using the given factory
template<class Expr>
@ -907,6 +920,16 @@ class optional : public optional_detail::optional_base<T>
this->assign( none_ ) ;
return *this ;
}
#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES)
// Constructs in-place
// upon exception *this is always uninitialized
template<class... Args>
void emplace ( Args&&... args )
{
this->emplace_assign( boost::forward<Args>(args)... );
}
#endif
void swap( optional & arg )
BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible<T>::value && ::boost::is_nothrow_move_assignable<T>::value)