--- C:/Data/Libs/boost/boost/interprocess/smart_ptr/unique_ptr.hpp	Fri Jan 18 21:50:33 2013
+++ C:/Data/Libs/LocalSVN/boost-trunk/boost/interprocess/smart_ptr/unique_ptr.hpp	Sat Nov 24 08:48:24 2012
@@ -82,9 +82,7 @@
 class unique_ptr
 {
    /// @cond
-   struct nat  {int for_bool;};
-   struct nat2 {int for_bool;};
-   typedef int nat2::*nullptr_t;
+   struct nat {int for_bool_;};
    typedef typename ipcdetail::add_reference<D>::type deleter_reference;
    typedef typename ipcdetail::add_reference<const D>::type deleter_const_reference;
    /// @endcond
@@ -177,7 +175,7 @@
    //!
    //!Throws: nothing.
    template <class U, class E>
-   unique_ptr(BOOST_RV_REF_BEG unique_ptr<U, E> BOOST_RV_REF_END u,
+   unique_ptr(BOOST_RV_REF_2_TEMPL_ARGS(unique_ptr, U, E) u,
       typename ipcdetail::enable_if_c<
             ipcdetail::is_convertible<typename unique_ptr<U, E>::pointer, pointer>::value &&
             ipcdetail::is_convertible<E, D>::value &&
@@ -232,7 +230,7 @@
    //!
    //!Throws: nothing.
    template <class U, class E>
-   unique_ptr& operator=(BOOST_RV_REF_BEG unique_ptr<U, E> BOOST_RV_REF_END u)
+   unique_ptr& operator=(BOOST_RV_REF_2_TEMPL_ARGS(unique_ptr, U, E) u)
    {
       reset(u.release());
       ptr_.second() = boost::move(u.get_deleter());
@@ -248,7 +246,7 @@
    //!Returns: *this.
    //!
    //!Throws: nothing.
-   unique_ptr& operator=(nullptr_t)
+   unique_ptr& operator=(int nat::*)
    {
       reset();
       return *this;