Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r78270 - sandbox/pool/boost/pool
From: svart.riddare_at_[hidden]
Date: 2012-04-30 10:15:53


Author: edupuis
Date: 2012-04-30 10:15:53 EDT (Mon, 30 Apr 2012)
New Revision: 78270
URL: http://svn.boost.org/trac/boost/changeset/78270

Log:
Added missing 'BOOST_PREVENT_MACRO_SUBSTITUTION' after compilation of 'libs/pool/test/test_poisoned_macros.cpp'.
Text files modified:
   sandbox/pool/boost/pool/static_pool.hpp | 12 ++++++------
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: sandbox/pool/boost/pool/static_pool.hpp
==============================================================================
--- sandbox/pool/boost/pool/static_pool.hpp (original)
+++ sandbox/pool/boost/pool/static_pool.hpp 2012-04-30 10:15:53 EDT (Mon, 30 Apr 2012)
@@ -34,17 +34,17 @@
                 :
                 pool<UserAllocator>(nrequested_size, nrequested_items)
     {
- free(pool<UserAllocator>::malloc());
+ free BOOST_PREVENT_MACRO_SUBSTITUTION(pool<UserAllocator>::malloc BOOST_PREVENT_MACRO_SUBSTITUTION());
                 }
 
     void * malloc BOOST_PREVENT_MACRO_SUBSTITUTION()
                 {
- return store().empty() ? NULL : store().malloc();
+ return store().empty() ? NULL : store().malloc BOOST_PREVENT_MACRO_SUBSTITUTION();
                 }
 
                 void * ordered_malloc()
                 {
- return store().empty() ? NULL : store().malloc();
+ return store().empty() ? NULL : store().malloc BOOST_PREVENT_MACRO_SUBSTITUTION();
                 }
 
                 void * ordered_malloc(size_type n)
@@ -60,7 +60,7 @@
   public: // Inherited functions
                 void free BOOST_PREVENT_MACRO_SUBSTITUTION(void * const chunk)
                 {
- return pool<UserAllocator>::free(chunk);
+ return pool<UserAllocator>::free BOOST_PREVENT_MACRO_SUBSTITUTION(chunk);
                 }
 
                 void ordered_free(void * const chunk)
@@ -70,7 +70,7 @@
 
                 void free BOOST_PREVENT_MACRO_SUBSTITUTION(void * const chunks, const size_type n)
     {
- return pool<UserAllocator>::free(chunks, n);
+ return pool<UserAllocator>::free BOOST_PREVENT_MACRO_SUBSTITUTION(chunks, n);
     }
 
     void ordered_free(void * const chunks, const size_type n)
@@ -80,7 +80,7 @@
 
     size_type get_requested_size() const
     {
- return pool<UserAllocator>::get_requestedSize();
+ return pool<UserAllocator>::get_requested_size();
                 }
        
     bool is_from(void * const chunk) const


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk