[Boost-commit] svn:boost r67746 - sandbox/guild/pool/libs/pool/test

Subject: [Boost-commit] svn:boost r67746 - sandbox/guild/pool/libs/pool/test
From: chankwanting_at_[hidden]
Date: 2011-01-06 22:10:06

Author: ktchan
Date: 2011-01-06 22:10:04 EST (Thu, 06 Jan 2011)
New Revision: 67746
URL: http://svn.boost.org/trac/boost/changeset/67746

Log:
Make test compile on GCC.
Text files modified: 
   sandbox/guild/pool/libs/pool/test/test_simple_seg_storage.hpp |    16 +++++++++-------                        
   sandbox/guild/pool/libs/pool/test/track_allocator.hpp         |     2 +-                                      
   2 files changed, 10 insertions(+), 8 deletions(-)

Modified: sandbox/guild/pool/libs/pool/test/test_simple_seg_storage.hpp
==============================================================================
--- sandbox/guild/pool/libs/pool/test/test_simple_seg_storage.hpp	(original)
+++ sandbox/guild/pool/libs/pool/test/test_simple_seg_storage.hpp	2011-01-06 22:10:04 EST (Thu, 06 Jan 2011)
@@ -100,7 +100,7 @@
         set_partition_size(npartition_sz);
         allocated_blocks.push_back(
             std::make_pair<void*, std::size_t>(block, nsz) );
-        simple_segregated_storage<std::size_t>::add_block(
+        boost::simple_segregated_storage<std::size_t>::add_block(
             block, nsz, npartition_sz );
         // Post: !empty()
         BOOST_TEST(!empty());
@@ -114,7 +114,7 @@
         set_partition_size(npartition_sz);
         allocated_blocks.push_back(
             std::make_pair<void*, std::size_t>(block, nsz) );
-        simple_segregated_storage<std::size_t>::add_ordered_block(
+        boost::simple_segregated_storage<std::size_t>::add_ordered_block(
             block, nsz, npartition_sz );
         // Post: !empty()
         BOOST_TEST(!empty());
@@ -122,7 +122,8 @@
 
     void* malloc()
     {
-        void* const ret = simple_segregated_storage<std::size_t>::malloc();
+        void* const ret
+            = boost::simple_segregated_storage<std::size_t>::malloc();
         // Chunk returned should actually be from added blocks
         BOOST_TEST(is_inside_allocated_blocks(ret));
         check_in(ret);
@@ -133,7 +134,7 @@
     {
         BOOST_ASSERT(chunk);
         check_out(chunk);
-        simple_segregated_storage<std::size_t>::free(chunk);
+        boost::simple_segregated_storage<std::size_t>::free(chunk);
         // Post: !empty()
         BOOST_TEST(!empty());
     }
@@ -142,15 +143,16 @@
     {
         BOOST_ASSERT(chunk);
         check_out(chunk);
-        simple_segregated_storage<std::size_t>::ordered_free(chunk);
+        boost::simple_segregated_storage<std::size_t>::ordered_free(chunk);
         // Post: !empty()
         BOOST_TEST(!empty());
     }
 
     void* malloc_n(size_type n, size_type partition_size)
     {
-        void* const ret = simple_segregated_storage<std::size_t>::malloc_n(n,
-            partition_size);
+        void* const ret
+            = boost::simple_segregated_storage<std::size_t>::malloc_n(
+                n, partition_size );
 
         if(ret)
         {

Modified: sandbox/guild/pool/libs/pool/test/track_allocator.hpp
==============================================================================
--- sandbox/guild/pool/libs/pool/test/track_allocator.hpp	(original)
+++ sandbox/guild/pool/libs/pool/test/track_allocator.hpp	2011-01-06 22:10:04 EST (Thu, 06 Jan 2011)
@@ -87,7 +87,7 @@
         return ret;
     }
 
-    static char* free(char* const block)
+    static void free(char* const block)
     {
         BOOST_TEST(allocated_blocks.find(block) != allocated_blocks.end());
         allocated_blocks.erase(block);