feedc0de/boost_move
1
0
Fork 0
forked from boostorg/move
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-09-16 22:19:15 +02:00
parent 3dc9689b89 8539131b2a
commit 677ba84740
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/move/default_delete.hpp
View File

@@ -17,7 +17,7 @@
#include <boost/move/utility_core.hpp> #include <boost/move/utility_core.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <cstddef> //For std::size_t #include <cstddef> //For std::size_t,std::nullptr_t
//!\file //!\file
//! Describes the default deleter (destruction policy) of <tt>unique_ptr</tt>: <tt>default_delete</tt>. //! Describes the default deleter (destruction policy) of <tt>unique_ptr</tt>: <tt>default_delete</tt>.
@@ -79,10 +79,12 @@ struct enable_defdel_call<U, T[N], Type>
struct bool_conversion {int for_bool; int for_arg(); }; struct bool_conversion {int for_bool; int for_arg(); };
typedef int bool_conversion::* explicit_bool_arg; typedef int bool_conversion::* explicit_bool_arg;
#if !defined(BOOST_NO_CXX11_NULLPTR) #if !defined(BOOST_NO_CXX11_NULLPTR) && !defined(BOOST_NO_CXX11_DECLTYPE)
typedef std::nullptr_t nullptr_type; typedef decltype(nullptr) nullptr_type;
#elif !defined(BOOST_NO_CXX11_NULLPTR)
typedef std::nullptr_t nullptr_type;
#else #else
typedef int (bool_conversion::*nullptr_type)(); typedef int (bool_conversion::*nullptr_type)();
#endif #endif
} //namespace move_upd { } //namespace move_upd {