Ticket #3950: boost_interprocess.patch

boost/interprocess/detail/move.hpp

@@ -34 +34 @@
 
 /// @cond
 
+#ifdef __GNUC__
+#   define BOOST_ATTRIBUTE_MAY_ALIAS __attribute__((__may_alias__))
+#else
+#   define BOOST_ATTRIBUTE_MAY_ALIAS
+#endif
+
 #define BOOST_MOVE_IN_BOOST_INTERPROCESS_NAMESPACE
 
 #ifdef BOOST_MOVE_IN_BOOST_INTERPROCESS_NAMESPACE
@@ -97 +103 @@
    ~rv();
    rv(rv const&);
    void operator=(rv const&);
-};
+} BOOST_ATTRIBUTE_MAY_ALIAS;
 
 //////////////////////////////////////////////////////////////////////////////
 //

boost/interprocess/mapped_region.hpp

@@ -81 +81 @@
 
    //!Move constructor. *this will be constructed taking ownership of "other"'s 
    //!region and "other" will be left in default constructor state.
-   mapped_region(BOOST_INTERPROCESS_RV_REF(mapped_region) other);
+   mapped_region(BOOST_INTERPROCESS_RV_REF(mapped_region) other)
+#if (defined BOOST_INTERPROCESS_WINDOWS)
+      :  m_base(0), m_size(0), m_offset(0)
+      ,  m_extra_offset(0)
+      ,  m_mode(read_only)
+      ,  m_file_mapping_hnd(detail::invalid_file())
+   {  this->swap(other);   }
+#else    //#if (defined BOOST_INTERPROCESS_WINDOWS)
+      :  m_base(MAP_FAILED), m_size(0), m_offset(0),  m_extra_offset(0), m_mode(read_only), m_is_xsi(false)
+   {  this->swap(other);   }
+#endif   //#if (defined BOOST_INTERPROCESS_WINDOWS)
 
    //!Destroys the mapped region.
    //!Does not throw
@@ -89 +99 @@
 
    //!Move assignment. If *this owns a memory mapped region, it will be
    //!destroyed and it will take ownership of "other"'s memory mapped region.
-   mapped_region &operator=(BOOST_INTERPROCESS_RV_REF(mapped_region) other);
+   mapped_region &operator=(BOOST_INTERPROCESS_RV_REF(mapped_region) other)
+   {
+      mapped_region tmp(boost::interprocess::move(other));
+      this->swap(tmp);
+      return *this;
+   }
 
    //!Returns the size of the mapping. Note for windows users: If
    //!windows_shared_memory is mapped using 0 as the size, it returns 0
@@ -154 +169 @@
 inline void swap(mapped_region &x, mapped_region &y)
 {  x.swap(y);  }
 
-inline mapped_region &mapped_region::operator=(BOOST_INTERPROCESS_RV_REF(mapped_region) moved)
-{
-   mapped_region tmp(boost::interprocess::move(moved));
-   this->swap(tmp);
-   return *this;
-}
-
 inline mapped_region::~mapped_region() 
 {  this->priv_close(); }
 
@@ -183 +191 @@
    ,  m_file_mapping_hnd(detail::invalid_file())
 {}
 
-inline mapped_region::mapped_region(BOOST_INTERPROCESS_RV_REF(mapped_region) other)
-   :  m_base(0), m_size(0), m_offset(0)
-   ,  m_extra_offset(0)
-   ,  m_mode(read_only)
-   ,  m_file_mapping_hnd(detail::invalid_file())
-{  this->swap(other);   }
-
 template<int dummy>
 inline std::size_t mapped_region::page_size_holder<dummy>::get_page_size()
 {
@@ -378 +379 @@
    :  m_base(MAP_FAILED), m_size(0), m_offset(0),  m_extra_offset(0), m_mode(read_only), m_is_xsi(false)
 {}
 
-inline mapped_region::mapped_region(BOOST_INTERPROCESS_RV_REF(mapped_region) other)
-   :  m_base(MAP_FAILED), m_size(0), m_offset(0),  m_extra_offset(0), m_mode(read_only), m_is_xsi(false)
-{  this->swap(other);   }
-
 template<int dummy>
 inline std::size_t mapped_region::page_size_holder<dummy>::get_page_size()
 {  return std::size_t(sysconf(_SC_PAGESIZE)); }