[Boost-commit] svn:boost r82778 - trunk/boost/interprocess/smart_ptr

Subject: [Boost-commit] svn:boost r82778 - trunk/boost/interprocess/smart_ptr
From: igaztanaga_at_[hidden]
Date: 2013-02-07 15:00:43

Author: igaztanaga
Date: 2013-02-07 15:00:42 EST (Thu, 07 Feb 2013)
New Revision: 82778
URL: http://svn.boost.org/trac/boost/changeset/82778

Log:
Fixes #7598
Text files modified: 
   trunk/boost/interprocess/smart_ptr/unique_ptr.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/interprocess/smart_ptr/unique_ptr.hpp
==============================================================================
--- trunk/boost/interprocess/smart_ptr/unique_ptr.hpp	(original)
+++ trunk/boost/interprocess/smart_ptr/unique_ptr.hpp	2013-02-07 15:00:42 EST (Thu, 07 Feb 2013)
@@ -83,7 +83,7 @@
 {
    /// @cond
    struct nat  {int for_bool;};
-   struct nat2 {int for_bool;};
+   struct nat2 {int for_nullptr;};
    typedef int nat2::*nullptr_t;
    typedef typename ipcdetail::add_reference<D>::type deleter_reference;
    typedef typename ipcdetail::add_reference<const D>::type deleter_const_reference;
@@ -288,7 +288,7 @@
    //!
    //!Throws: nothing.
    operator int nat::*() const
-   {  return ptr_.first() ? &nat::for_bool_ : 0;   }
+   {  return ptr_.first() ? &nat::for_bool : 0;   }
 
    //!Postcondition: get() == 0.
    //!
@@ -459,7 +459,7 @@
     pointer get()        const {return ptr_.first();}
     deleter_reference       get_deleter()       {return ptr_.second();}
     deleter_const_reference get_deleter() const {return ptr_.second();}
-    operator int nat::*() const {return ptr_.first() ? &nat::for_bool_ : 0;}
+    operator int nat::*() const {return ptr_.first() ? &nat::for_bool : 0;}
 
     // modifiers
     pointer release()