[Boost-commit] svn:boost r54036 - in sandbox/monotonic: boost/monotonic libs/monotonic/test

Subject: [Boost-commit] svn:boost r54036 - in sandbox/monotonic: boost/monotonic libs/monotonic/test
From: christian.schladetsch_at_[hidden]
Date: 2009-06-17 19:56:57

Author: cschladetsch
Date: 2009-06-17 19:56:55 EDT (Wed, 17 Jun 2009)
New Revision: 54036
URL: http://svn.boost.org/trac/boost/changeset/54036

Log:
fixes for GCC
Text files modified: 
   sandbox/monotonic/boost/monotonic/shared_storage.hpp |    18 +++++++++---------                      
   sandbox/monotonic/libs/monotonic/test/main.cpp       |     4 ++--                                    
   2 files changed, 11 insertions(+), 11 deletions(-)

Modified: sandbox/monotonic/boost/monotonic/shared_storage.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/shared_storage.hpp	(original)
+++ sandbox/monotonic/boost/monotonic/shared_storage.hpp	2009-06-17 19:56:55 EDT (Wed, 17 Jun 2009)
@@ -21,7 +21,7 @@
                         typedef storage<InlineSize, MinHeapSize, Al> Storage;
 
                 private:
-			Storage storage;
+			Storage store;
                         mutable mutex guard;
 
                 public:
@@ -29,43 +29,43 @@
                         {
                         }
                         shared_storage(Al const &A)
-				: storage(A)
+				: store(A)
                         {
                         }
                         size_t used() const
                         {
                                 mutex::scoped_lock lock(guard);
-				return storage.used();
+				return store.used();
                         }
                         void reset()
                         {
                                 mutex::scoped_lock lock(guard);
-				storage.reset();
+				store.reset();
                         }
                         void release()
                         {
                                 mutex::scoped_lock lock(guard);
-				storage.release();
+				store.release();
                         }
                         void *allocate(size_t num_bytes, size_t alignment)
                         {
                                 mutex::scoped_lock lock(guard);
-				return storage.allocate(num_bytes, alignment);
+				return store.allocate(num_bytes, alignment);
                         }
                         size_t remaining() const
                         {
                                 mutex::scoped_lock lock(guard);
-				return storage.remaining();
+				return store.remaining();
                         }
                         size_t fixed_remaining() const
                         {
                                 mutex::scoped_lock lock(guard);
-				return storage.fixed_remaining();
+				return store.fixed_remaining();
                         }
                         size_t max_size() const
                         {
                                 mutex::scoped_lock lock(guard);
-				return storage.max_size();
+				return store.max_size();
                         }
 
                 };

Modified: sandbox/monotonic/libs/monotonic/test/main.cpp
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/main.cpp	(original)
+++ sandbox/monotonic/libs/monotonic/test/main.cpp	2009-06-17 19:56:55 EDT (Wed, 17 Jun 2009)
@@ -5,8 +5,8 @@
 
 // the sandbox is at https://svn.boost.org/svn/boost/sandbox/monotonic/
 
-//#include <boost/monotonic/shared_storage.hpp>
-//#include <boost/monotonic/shared_allocator.hpp>
+#include <boost/monotonic/shared_storage.hpp>
+#include <boost/monotonic/shared_allocator.hpp>
 
 #include <boost/monotonic/static_storage.hpp>