Subject: [Boost-commit] svn:boost r79463 - in trunk/libs/container: doc proj/vc7ide test
From: igaztanaga_at_[hidden]
Date: 2012-07-12 19:26:44
Author: igaztanaga
Date: 2012-07-12 19:26:43 EDT (Thu, 12 Jul 2012)
New Revision: 79463
URL: http://svn.boost.org/trac/boost/changeset/79463
Log:
Ticket #7123: Forward declaration for scoped allocator customization traits.
Text files modified:
trunk/libs/container/doc/container.qbk | 12 ++++++++----
trunk/libs/container/proj/vc7ide/container.vcproj | 3 +++
trunk/libs/container/test/scoped_allocator_adaptor_test.cpp | 15 ++++++++-------
trunk/libs/container/test/util.hpp | 2 +-
4 files changed, 20 insertions(+), 12 deletions(-)
Modified: trunk/libs/container/doc/container.qbk
==============================================================================
--- trunk/libs/container/doc/container.qbk (original)
+++ trunk/libs/container/doc/container.qbk 2012-07-12 19:26:43 EDT (Thu, 12 Jul 2012)
@@ -439,7 +439,7 @@
[section:scoped_allocator Scoped allocators]
C++11 improves stateful allocators with the introduction of
-[@http://http://en.cppreference.com/w/cpp/memory/scoped_allocator_adaptor `std::scoped_allocator_adaptor`]
+[@http://en.cppreference.com/w/cpp/memory/scoped_allocator_adaptor `std::scoped_allocator_adaptor`]
class template. `scoped_allocator_adaptor` is instantiated with one outer allocator and zero or more inner
allocators.
@@ -617,8 +617,12 @@
[section:release_notes_boost_1_51_00 Boost 1.51 Release]
* Fixed bugs
+ [@https://svn.boost.org/trac/boost/ticket/6763 #6763],
+ [@https://svn.boost.org/trac/boost/ticket/6803 #6803],
[@https://svn.boost.org/trac/boost/ticket/7114 #7114],
[@https://svn.boost.org/trac/boost/ticket/7103 #7103].
+ [@https://svn.boost.org/trac/boost/ticket/7123 #7123],
+
[endsect]
@@ -627,13 +631,13 @@
* Added Scoped Allocator Model support.
* Fixed bugs
+ [@https://svn.boost.org/trac/boost/ticket/6533 #6533],
+ [@https://svn.boost.org/trac/boost/ticket/6536 #6536],
[@https://svn.boost.org/trac/boost/ticket/6566 #6566],
[@https://svn.boost.org/trac/boost/ticket/6575 #6575],
[@https://svn.boost.org/trac/boost/ticket/6606 #6606],
[@https://svn.boost.org/trac/boost/ticket/6615 #6615],
- [@https://svn.boost.org/trac/boost/ticket/6533 #6533],
- [@https://svn.boost.org/trac/boost/ticket/6536 #6536],
-
+
[endsect]
Modified: trunk/libs/container/proj/vc7ide/container.vcproj
==============================================================================
--- trunk/libs/container/proj/vc7ide/container.vcproj (original)
+++ trunk/libs/container/proj/vc7ide/container.vcproj 2012-07-12 19:26:43 EDT (Thu, 12 Jul 2012)
@@ -204,6 +204,9 @@
RelativePath="..\..\..\..\boost\container\scoped_allocator.hpp">
</File>
<File
+ RelativePath="..\..\..\..\boost\container\scoped_allocator_fwd.hpp">
+ </File>
+ <File
RelativePath="..\..\..\..\boost\container\set.hpp">
</File>
<File
Modified: trunk/libs/container/test/scoped_allocator_adaptor_test.cpp
==============================================================================
--- trunk/libs/container/test/scoped_allocator_adaptor_test.cpp (original)
+++ trunk/libs/container/test/scoped_allocator_adaptor_test.cpp 2012-07-12 19:26:43 EDT (Thu, 12 Jul 2012)
@@ -8,20 +8,15 @@
//
//////////////////////////////////////////////////////////////////////////////
#include <boost/container/detail/config_begin.hpp>
-#include <boost/container/scoped_allocator.hpp>
+#include <boost/container/scoped_allocator_fwd.hpp>
#include <cstddef>
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/container/detail/function_detector.hpp>
#include <boost/container/detail/mpl.hpp>
#include <boost/move/move.hpp>
+#include <boost/type_traits/integral_constant.hpp>
#include <memory>
-#include <boost/container/vector.hpp>
-#include <boost/container/detail/pair.hpp>
using namespace boost::container;
-
template<class T, unsigned int Id, bool Propagate = false>
class test_allocator
{
@@ -242,6 +237,12 @@
} //namespace boost {
+#include <boost/container/scoped_allocator.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/container/vector.hpp>
+#include <boost/container/detail/pair.hpp>
+
int main()
{
typedef test_allocator<tagged_integer<0>, 0> OuterAlloc;
Modified: trunk/libs/container/test/util.hpp
==============================================================================
--- trunk/libs/container/test/util.hpp (original)
+++ trunk/libs/container/test/util.hpp 2012-07-12 19:26:43 EDT (Thu, 12 Jul 2012)
@@ -71,7 +71,7 @@
boost::xtime xsecs(int secs)
{
boost::xtime ret;
- boost::xtime_get(&ret, boost::TIME_UTC_);
+ boost::xtime_get(&ret, boost::TIME_UTC);
ret.sec += secs;
return ret;
}