Subject: [Boost-commit] svn:boost r73148 - in sandbox/guild/pool: boost/pool libs/pool/doc libs/pool/example libs/pool/test
From: john_at_[hidden]
Date: 2011-07-16 10:50:08
Author: johnmaddock
Date: 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
New Revision: 73148
URL: http://svn.boost.org/trac/boost/changeset/73148
Log:
Update docs to latest AutoIndex version.
Fix -Wshadow warnings and update Jamfile to make them errors.
Fix singleton_pool to correctly propagate the MaxSize parameter.
Refs #5700.
Refs #5568.
Binary files modified:
sandbox/guild/pool/libs/pool/doc/pool.pdf
Text files modified:
sandbox/guild/pool/boost/pool/object_pool.hpp | 4 ++--
sandbox/guild/pool/boost/pool/singleton_pool.hpp | 2 +-
sandbox/guild/pool/libs/pool/doc/jamfile.v2 | 1 +
sandbox/guild/pool/libs/pool/example/time_pool_alloc.cpp | 6 +++---
sandbox/guild/pool/libs/pool/test/Jamfile.v2 | 1 +
sandbox/guild/pool/libs/pool/test/test_bug_5526.cpp | 4 ++--
6 files changed, 10 insertions(+), 8 deletions(-)
Modified: sandbox/guild/pool/boost/pool/object_pool.hpp
==============================================================================
--- sandbox/guild/pool/boost/pool/object_pool.hpp (original)
+++ sandbox/guild/pool/boost/pool/object_pool.hpp 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -96,9 +96,9 @@
}
public:
- explicit object_pool(const size_type next_size = 32, const size_type max_size = 0)
+ explicit object_pool(const size_type arg_next_size = 32, const size_type arg_max_size = 0)
:
- pool<UserAllocator>(sizeof(T), next_size, max_size)
+ pool<UserAllocator>(sizeof(T), arg_next_size, arg_max_size)
{ //! Constructs a new (empty by default) ObjectPool.
//! \param next_size Number of chunks to request from the system the next time that object needs to allocate system memory (default 32).
//! \pre next_size != 0.
Modified: sandbox/guild/pool/boost/pool/singleton_pool.hpp
==============================================================================
--- sandbox/guild/pool/boost/pool/singleton_pool.hpp (original)
+++ sandbox/guild/pool/boost/pool/singleton_pool.hpp 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -117,7 +117,7 @@
#ifndef BOOST_DOXYGEN
struct pool_type: public Mutex, public pool<UserAllocator>
{
- pool_type() : pool<UserAllocator>(RequestedSize, NextSize) {}
+ pool_type() : pool<UserAllocator>(RequestedSize, NextSize, MaxSize) {}
}; // struct pool_type: Mutex
#else
Modified: sandbox/guild/pool/libs/pool/doc/jamfile.v2
==============================================================================
--- sandbox/guild/pool/libs/pool/doc/jamfile.v2 (original)
+++ sandbox/guild/pool/libs/pool/doc/jamfile.v2 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -134,6 +134,7 @@
# <auto-index>on turns on index (or off).
<auto-index>on
+ <auto-index-verbose>on
# Choose indexing method (separately for html and pdf):
<format>html:<auto-index-internal>on # on (or off) to use internally generated indexes.
Modified: sandbox/guild/pool/libs/pool/doc/pool.pdf
==============================================================================
Binary files. No diff available.
Modified: sandbox/guild/pool/libs/pool/example/time_pool_alloc.cpp
==============================================================================
--- sandbox/guild/pool/libs/pool/example/time_pool_alloc.cpp (original)
+++ sandbox/guild/pool/libs/pool/example/time_pool_alloc.cpp 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -159,12 +159,12 @@
start = std::clock();
for(l = 0; l < num_loops; ++l)
{
- boost::pool<> p(sizeof(int));
+ boost::pool<> p2(sizeof(int));
for (unsigned long i = 0; i < num_ints; ++i)
{
- void * const t = p.malloc();
+ void * const t = p2.malloc();
if (t != 0)
- p.free(t);
+ p2.free(t);
}
}
end[0][5] = (std::clock() - start) / ((double) CLOCKS_PER_SEC);
Modified: sandbox/guild/pool/libs/pool/test/Jamfile.v2
==============================================================================
--- sandbox/guild/pool/libs/pool/test/Jamfile.v2 (original)
+++ sandbox/guild/pool/libs/pool/test/Jamfile.v2 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -10,6 +10,7 @@
<define>BOOST_ALL_NO_LIB=1
<warnings>all
<toolset>gcc:<cxxflags>-Wextra
+ <toolset>gcc:<cxxflags>-Wshadow
<toolset>gcc:<warnings-as-errors>on
<toolset>gcc:<cxxflags>-Wno-long-long
<toolset>gcc:<cxxflags>-Wcast-align
Modified: sandbox/guild/pool/libs/pool/test/test_bug_5526.cpp
==============================================================================
--- sandbox/guild/pool/libs/pool/test/test_bug_5526.cpp (original)
+++ sandbox/guild/pool/libs/pool/test/test_bug_5526.cpp 2011-07-16 10:50:06 EDT (Sat, 16 Jul 2011)
@@ -26,10 +26,10 @@
int* buf;
};
-std::auto_ptr<bad> ptr;
+std::auto_ptr<bad> aptr;
int main()
{
- ptr.reset(new bad());
+ aptr.reset(new bad());
return 0;
}