[Boost-commit] svn:boost r85589 - in trunk: boost/interprocess/detail libs/interprocess/doc

Subject: [Boost-commit] svn:boost r85589 - in trunk: boost/interprocess/detail libs/interprocess/doc
From: igaztanaga_at_[hidden]
Date: 2013-09-07 02:56:47

Author: igaztanaga
Date: 2013-09-07 02:56:47 EDT (Sat, 07 Sep 2013)
New Revision: 85589
URL: http://svn.boost.org/trac/boost/changeset/85589

Log:
Fixes #9073

Text files modified: 
   trunk/boost/interprocess/detail/win32_api.hpp |     8 ++++----                                
   trunk/libs/interprocess/doc/interprocess.qbk  |     1 +                                       
   2 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/boost/interprocess/detail/win32_api.hpp
==============================================================================
--- trunk/boost/interprocess/detail/win32_api.hpp	Fri Sep  6 17:52:24 2013	(r85588)
+++ trunk/boost/interprocess/detail/win32_api.hpp	2013-09-07 02:56:47 EDT (Sat, 07 Sep 2013)	(r85589)
@@ -1584,7 +1584,7 @@
       delete[]m_buf;
    }
 
-   void realloc(std::size_t num_bytes)
+   void realloc_mem(std::size_t num_bytes)
    {
       num_bytes += rename_suffix + rename_offset;
       char *buf = m_buf;
@@ -1619,7 +1619,7 @@
       if(m_buf) ::free(m_buf);
    }
 
-   void realloc(std::size_t num_bytes)
+   void realloc_mem(std::size_t num_bytes)
    {
       void *buf = ::realloc(m_buf, num_bytes);
       if(!buf){
@@ -1674,7 +1674,7 @@
          //Obtain file name with guessed length
          if(pNtQueryObject(fh, object_name_information, nt_query_mem.query_mem(), nt_query_mem.object_name_information_size(), &size)){
             //Obtain file name with exact length buffer
-            nt_query_mem.realloc(size);
+            nt_query_mem.realloc_mem(size);
             if(pNtQueryObject(fh, object_name_information, nt_query_mem.query_mem(), nt_query_mem.object_name_information_size(), &size)){
                return false;
             }
@@ -2056,7 +2056,7 @@
                if (error_insufficient_buffer == status) {
                   status = 0;
                   dwBytesToRead = dwMinimumBytesToRead;
-                  heap_deleter.realloc(dwMinimumBytesToRead);
+                  heap_deleter.realloc_mem(dwMinimumBytesToRead);
                   if (!heap_deleter.get()){
                      return false;
                   }

Modified: trunk/libs/interprocess/doc/interprocess.qbk
==============================================================================
--- trunk/libs/interprocess/doc/interprocess.qbk	Fri Sep  6 17:52:24 2013	(r85588)
+++ trunk/libs/interprocess/doc/interprocess.qbk	2013-09-07 02:56:47 EDT (Sat, 07 Sep 2013)	(r85589)
@@ -6720,6 +6720,7 @@
               [@https://svn.boost.org/trac/boost/ticket/8277 #8277],
               [@https://svn.boost.org/trac/boost/ticket/8976 #8976],
               [@https://svn.boost.org/trac/boost/ticket/9065 #9065],
+              [@https://svn.boost.org/trac/boost/ticket/9073 #9073],
               [@https://svn.boost.org/trac/boost/ticket/8277 #9908].
 
 [endsect]