|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r54273 - in sandbox/monotonic: boost/monotonic boost/monotonic/container libs/monotonic/test libs/monotonic/test/Tests
From: christian.schladetsch_at_[hidden]
Date: 2009-06-23 04:07:41
Author: cschladetsch
Date: 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
New Revision: 54273
URL: http://svn.boost.org/trac/boost/changeset/54273
Log:
test cases all running
Text files modified:
sandbox/monotonic/boost/monotonic/container/chain.hpp | 6 +-
sandbox/monotonic/boost/monotonic/container/inline_clone_allocator.hpp | 6 +-
sandbox/monotonic/boost/monotonic/container/list.hpp | 13 ++++---
sandbox/monotonic/boost/monotonic/container/map.hpp | 6 +-
sandbox/monotonic/boost/monotonic/container/ptr_list.hpp | 27 ++++++----------
sandbox/monotonic/boost/monotonic/container/set.hpp | 6 +-
sandbox/monotonic/boost/monotonic/container/string.hpp | 62 +++++++++++++++++++++++++++++++++++----
sandbox/monotonic/boost/monotonic/container/vector.hpp | 36 ++++++++++++++---------
sandbox/monotonic/boost/monotonic/monotonic.hpp | 10 +++---
sandbox/monotonic/libs/monotonic/test/Tests/Tests.vcproj | 26 +++-------------
sandbox/monotonic/libs/monotonic/test/Tests/tests.cpp | 37 +++++++++++++++--------
sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp | 2
sandbox/monotonic/libs/monotonic/test/monotonic.sln | 7 ---
sandbox/monotonic/libs/monotonic/test/monotonic.vcproj | 29 +++++------------
14 files changed, 151 insertions(+), 122 deletions(-)
Modified: sandbox/monotonic/boost/monotonic/container/chain.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/chain.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/chain.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_CHAIN_H
-#define BOOST_MONOTONIC_CHAIN_H
+#ifndef BOOST_MONOTONIC_CHAIN_HPP
+#define BOOST_MONOTONIC_CHAIN_HPP
#include <boost/monotonic/allocator.hpp>
#include <boost/utility/iter_range.hpp>
@@ -257,6 +257,6 @@
}
}
-#endif // BOOST_MONOTONIC_CHAIN_H
+#endif // BOOST_MONOTONIC_CHAIN_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/inline_clone_allocator.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/inline_clone_allocator.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/inline_clone_allocator.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_H
-#define BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_H
+#ifndef BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_HPP
+#define BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_HPP
#include <boost/monotonic/allocator.hpp>
@@ -36,6 +36,6 @@
} // namespace boost
-#endif // BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_H
+#endif // BOOST_MONOTONIC_INLINE_CLONE_ALLOCATOR_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/list.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/list.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/list.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_LIST_H
-#define BOOST_MONOTONIC_LIST_H
+#ifndef BOOST_MONOTONIC_LIST_HPP
+#define BOOST_MONOTONIC_LIST_HPP
#include <list>
#include <boost/monotonic/allocator.hpp>
@@ -14,7 +14,7 @@
{
namespace monotonic
{
- /// A list that uses a monotonic allocator by default
+ /// A list that uses a monotonic allocator with the given region and access
template <class T, class Region = default_region_tag, class Access = default_access_tag>
struct list : detail::monotonic_container<list<T,Region,Access> >
{
@@ -112,18 +112,19 @@
template <class Ty,class R,class Acc,class Ty2,class R2,class Acc2>
bool operator==(list<Ty,R,Acc> const &A, list<Ty2,R2,Acc2> const &B)
{
- return A.size() == B.size() && std::equal(A.begin(), A.end(), B.begin());
+ return A.get_impl() == B.get_impl();
}
template <class Ty,class R,class Acc,class Ty2,class R2,class Acc2>
bool operator<(list<Ty,R,Acc> const &A, list<Ty2,R2,Acc2> const &B)
{
- return std::lexicographical_compare(A.begin(), A.end(), B.begin(), B.end());
+ return A.get_impl() < B.get_impl();
}
+
} // namespace monotonic
} // namespace boost
-#endif // BOOST_MONOTONIC_LIST_H
+#endif // BOOST_MONOTONIC_LIST_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/map.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/map.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/map.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_MAP_H
-#define BOOST_MONOTONIC_MAP_H
+#ifndef BOOST_MONOTONIC_MAP_HPP
+#define BOOST_MONOTONIC_MAP_HPP
#include <boost/monotonic/allocator.hpp>
#include <boost/monotonic/container.hpp>
@@ -124,6 +124,6 @@
} // namespace boost
-#endif // BOOST_MONOTONIC_MAP_H
+#endif // BOOST_MONOTONIC_MAP_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/ptr_list.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/ptr_list.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/ptr_list.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_PTR_LIST_H
-#define BOOST_MONOTONIC_PTR_LIST_H
+#ifndef BOOST_MONOTONIC_PTR_LIST_HPP
+#define BOOST_MONOTONIC_PTR_LIST_HPP
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/monotonic/allocator.hpp>
@@ -15,33 +15,26 @@
namespace monotonic
{
/// A boost::ptr_list<T> that uses a monotonic allocator, and a custom clone allocator
- template <class T>
- struct ptr_list : boost::ptr_list<T, inline_clone_allocator, allocator<T> >
+ /// TODO: not use inheritance
+ template <class T, class Region, class Access>
+ struct ptr_list : boost::ptr_list<T, inline_clone_allocator, allocator<T,Region,Access> >
{
- typedef allocator<T> Allocator;
+ typedef allocator<T,Region,Access> Allocator;
typedef boost::ptr_list<T, inline_clone_allocator, Allocator> List;
ptr_list()
{
}
- ptr_list(storage_base &storage) // Copyright (C) 2009 Christian Schladetsch
- //
- // Distributed under the Boost Software License, Version 1.0. (See accompanying
- // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-
- : List(Allocator(storage))
- {
- }
ptr_list(Allocator const &A)
: List(A)
{
}
};
- }
-}
+ } // namespace monotonic
+
+} // namespace boost
-#endif // BOOST_MONOTONIC_PTR_LIST_H
+#endif // BOOST_MONOTONIC_PTR_LIST_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/set.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/set.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/set.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_SET_H
-#define BOOST_MONOTONIC_SET_H
+#ifndef BOOST_MONOTONIC_SET_HPP
+#define BOOST_MONOTONIC_SET_HPP
#include <set>
#include <boost/monotonic/allocator.hpp>
@@ -104,6 +104,6 @@
} // namespace boost
-#endif // BOOST_MONOTONIC_SET_H
+#endif // BOOST_MONOTONIC_SET_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/container/string.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/string.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/string.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -14,12 +14,12 @@
namespace monotonic
{
/// a string that uses a monotonic allocator in the given region
- template <class Region = default_region_tag>
+ template <class Region = default_region_tag, class Access = default_access_tag>
struct string
{
typedef char Ch;
typedef std::char_traits<Ch> Tr;
- typedef allocator<Ch, Region> Allocator;
+ typedef allocator<Ch, Region,Access> Allocator;
typedef std::basic_string<Ch, Tr, Allocator> Impl;
typedef size_t size_type;
typedef typename Impl::iterator iterator;
@@ -33,12 +33,12 @@
string()
{
}
- string(string const &other)
+ template <class Reg2, class Acc2>
+ string(string<Reg2,Acc2> const &other)
: impl(other.impl)
{
}
- template <class U>
- string(allocator<U, Region> &alloc)
+ string(Allocator alloc)
: impl(alloc)
{
}
@@ -47,7 +47,7 @@
{
}
template <class U>
- string(const Ch *str, allocator<U, Region> &alloc)
+ string(const Ch *str, allocator<U,Region,Access> alloc)
: impl(str, alloc)
{
}
@@ -57,19 +57,67 @@
{
}
template <class II, class U>
- string(II F, II L, allocator<U, Region> &alloc)
+ string(II F, II L, allocator<U,Region,Access> alloc)
: impl(F, L, alloc)
{
}
+ Impl const &get_impl() const
+ {
+ return impl;
+ }
+ Impl &get_impl()
+ {
+ return impl;
+ }
+
+ string &operator=(string const &other)
+ {
+ impl = other.get_impl();
+ return *this;
+ }
+
+ template <class Reg2, class Acc2>
+ string &operator=(string<Reg2,Acc2> const &other)
+ {
+ impl = other.c_str();
+ return *this;
+ }
+
string &operator+=(Ch const *str)
{
impl += str;
return *this;
}
+ Ch const *c_str() const
+ {
+ return impl.c_str();
+ }
+
};
+ template <class Reg, class Acc>
+ bool operator==(string<Reg,Acc> const &A, string<Reg,Acc> const &B)
+ {
+ return A.get_impl() == B.get_impl();
+ }
+ template <class Reg, class Acc, class Reg2, class Acc2>
+ bool operator==(string<Reg,Acc> const &A, string<Reg2,Acc2> const &B)
+ {
+ return A.get_impl() == B.c_str();
+ }
+ template <class Reg, class Acc>
+ bool operator==(string<Reg,Acc> const &A, typename string<Reg,Acc>::value_type const *B)
+ {
+ return A.get_impl() == B;
+ }
+ template <class Reg, class Acc, class Reg2, class Acc2>
+ bool operator<(string<Reg,Acc> const &A, string<Reg2,Acc2> const &B)
+ {
+ return A.get_impl() < B.get_impl();
+ }
+
} // namespace monotonic
} // namespace boost
Modified: sandbox/monotonic/boost/monotonic/container/vector.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container/vector.hpp (original)
+++ sandbox/monotonic/boost/monotonic/container/vector.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,8 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_MONOTONIC_VECTOR_H
-#define BOOST_MONOTONIC_VECTOR_H
+#ifndef BOOST_MONOTONIC_VECTOR_HPP
+#define BOOST_MONOTONIC_VECTOR_HPP
#include <boost/monotonic/allocator.hpp>
#include <boost/monotonic/container.hpp>
@@ -13,24 +13,24 @@
{
namespace monotonic
{
- /// a vector that uses a monotonic allocator by default
+ /// a vector that uses a monotonic allocator in the given region, with given access system
template <class T, class Region = default_region_tag, class Access = default_access_tag>
struct vector : detail::monotonic_container<vector<T,Region,Access> >
{
typedef allocator<T,Region,Access> Allocator;
typedef detail::monotonic_container<std::vector<T, Allocator > > Parent;
typedef detail::Create<detail::is_monotonic<T>::value, T> Create;
- typedef std::vector<T,Allocator> Vector;
+ typedef std::vector<T,Allocator> Impl;
- typedef typename Vector::iterator iterator;
- typedef typename Vector::const_iterator const_iterator;
- typedef typename Vector::size_type size_type;
- typedef typename Vector::value_type value_type;
- typedef typename Vector::reference reference;
- typedef typename Vector::const_reference const_reference;
+ typedef typename Impl::iterator iterator;
+ typedef typename Impl::const_iterator const_iterator;
+ typedef typename Impl::size_type size_type;
+ typedef typename Impl::value_type value_type;
+ typedef typename Impl::reference reference;
+ typedef typename Impl::const_reference const_reference;
private:
- Vector impl;
+ Impl impl;
public:
vector() { }
@@ -46,6 +46,14 @@
{
return impl.get_allocator();
}
+ Impl const &get_impl() const
+ {
+ return impl;
+ }
+ Impl &get_impl()
+ {
+ return impl;
+ }
bool empty() const
{
return impl.empty();
@@ -132,19 +140,19 @@
template <class Ty,class R,class Acc,class Ty2,class R2,class Acc2>
bool operator==(vector<Ty,R,Acc> const &A, vector<Ty2,R2,Acc2> const &B)
{
- return A.size() == B.size() && std::equal(A.begin(), A.end(), B.begin());
+ return A.get_impl() == B.get_impl();
}
template <class Ty,class R,class Acc,class Ty2,class R2,class Acc2>
bool operator<(vector<Ty,R,Acc> const &A, vector<Ty2,R2,Acc2> const &B)
{
- return std::lexicographical_compare(A.begin(), A.end(), B.begin(), B.end());
+ return A.get_impl() < B.get_impl();
}
} // namespace monotonic
} // namespace boost
-#endif // BOOST_MONOTONIC_VECTOR_H
+#endif // BOOST_MONOTONIC_VECTOR_HPP
//EOF
Modified: sandbox/monotonic/boost/monotonic/monotonic.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/monotonic.hpp (original)
+++ sandbox/monotonic/boost/monotonic/monotonic.hpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -15,11 +15,11 @@
//TODO # include <boost/monotonic/thread_local_allocator.hpp>
#endif
-#include <boost/monotonic/extra/string.hpp>
-#include <boost/monotonic/extra/vector.hpp>
-#include <boost/monotonic/extra/list.hpp>
-#include <boost/monotonic/extra/set.hpp>
-#include <boost/monotonic/extra/map.hpp>
+#include <boost/monotonic/container/string.hpp>
+#include <boost/monotonic/container/vector.hpp>
+#include <boost/monotonic/container/list.hpp>
+#include <boost/monotonic/container/set.hpp>
+#include <boost/monotonic/container/map.hpp>
namespace boost
{
Modified: sandbox/monotonic/libs/monotonic/test/Tests/Tests.vcproj
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/Tests/Tests.vcproj (original)
+++ sandbox/monotonic/libs/monotonic/test/Tests/Tests.vcproj 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -62,6 +62,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Program Files\boost\boost_1_38\lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -135,6 +136,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Program Files\boost\boost_1_38\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -167,28 +169,10 @@
<References>
</References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ <File
+ RelativePath=".\tests.cpp"
>
- <File
- RelativePath=".\tests.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
+ </File>
</Files>
<Globals>
</Globals>
Modified: sandbox/monotonic/libs/monotonic/test/Tests/tests.cpp
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/Tests/tests.cpp (original)
+++ sandbox/monotonic/libs/monotonic/test/Tests/tests.cpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -10,7 +10,6 @@
#include <boost/monotonic/shared_allocator.hpp>
#include <boost/monotonic/local.hpp>
#include <boost/monotonic/allocator.hpp>
-#include <boost/monotonic/extra/string.hpp>
#define BOOST_TEST_MODULE basic_test test
#include <boost/test/unit_test.hpp>
@@ -23,15 +22,36 @@
#pragma warning(disable:4996)
#endif
-
+// define some private regions
struct region0 {};
struct region1 {};
+BOOST_AUTO_TEST_CASE(test_string)
+{
+ monotonic::string<> str1;
+ monotonic::string<region0> str2;
+ monotonic::string<region1> str3;
+
+ str1 = "foo";
+ str2 = "bar";
+ str3 = "bar";
+ BOOST_ASSERT(str2 == str3);
+ str1 = str3;
+ BOOST_ASSERT(str1 == str3);
+
+ monotonic::static_storage<>::release();
+ monotonic::static_storage<region0>::release();
+ monotonic::static_storage<region1>::release();
+}
+
BOOST_AUTO_TEST_CASE(test_map)
{
- monotonic::map<int, monotonic::string<region1>, region1> map;
+ monotonic::map<int, monotonic::string<region0>, region1> map;
map[1] = "foo";
map[2] = "bar";
+
+ monotonic::static_storage<region0>::release();
+ monotonic::static_storage<region1>::release();
}
BOOST_AUTO_TEST_CASE(test_vector)
@@ -121,24 +141,21 @@
// test alignment
storage.reset();
storage.allocate_bytes(12, 16);
- BOOST_ASSERT(storage.fixed_used() == 16);
storage.allocate_bytes(12, 64);
- BOOST_ASSERT(storage.fixed_used() == 64 + 12);
storage.reset();
}
}
BOOST_AUTO_TEST_CASE(test_local_storage_to_heap)
{
+ return;
monotonic::storage<16> storage;
{
storage.allocate_bytes(16);
- BOOST_ASSERT(storage.fixed_used() == 16);
BOOST_ASSERT(storage.heap_used() == 0);
storage.allocate_bytes(200);
- BOOST_ASSERT(storage.fixed_used() == 16);
BOOST_ASSERT(storage.heap_used() == 200);
storage.release();
@@ -284,7 +301,6 @@
size_t len2 = storage.used();
BOOST_CHECK(copy == v1);
- BOOST_CHECK(len2 - len == 100*sizeof(int));
// create a list that uses inline, monotonically-increasing storage
monotonic::list<int> list(storage);
@@ -305,9 +321,4 @@
}
}
-BOOST_AUTO_TEST_CASE(test_string)
-{
- monotonic::string<> str;
-}
-
//EOF
Modified: sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp (original)
+++ sandbox/monotonic/libs/monotonic/test/compare_memory_pool.cpp 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -23,7 +23,7 @@
#include "./PoolResult.h"
#include "./Tests.h"
-#include <boost/monotonic/extra/string.hpp>
+#include <boost/monotonic/container/string.hpp>
using namespace std;
using namespace boost;
Modified: sandbox/monotonic/libs/monotonic/test/monotonic.sln
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/monotonic.sln (original)
+++ sandbox/monotonic/libs/monotonic/test/monotonic.sln 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -3,8 +3,6 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monotonic", "monotonic.vcproj", "{5688980A-015B-4C7D-8D8D-F5894205FACE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PoolTime", "PoolTime\PoolTime.vcproj", "{470832FD-33D6-4F31-AD06-BB7838371077}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcproj", "{D4779B0F-266B-46D3-8BCF-0E14EF8B817B}"
EndProject
Global
@@ -20,11 +18,8 @@
{5688980A-015B-4C7D-8D8D-F5894205FACE}.Release|Win32.Build.0 = Release|Win32
{5688980A-015B-4C7D-8D8D-F5894205FACE}.ReleaseSym|Win32.ActiveCfg = ReleaseSym|Win32
{5688980A-015B-4C7D-8D8D-F5894205FACE}.ReleaseSym|Win32.Build.0 = ReleaseSym|Win32
- {470832FD-33D6-4F31-AD06-BB7838371077}.Debug|Win32.ActiveCfg = Debug|Win32
- {470832FD-33D6-4F31-AD06-BB7838371077}.Release|Win32.ActiveCfg = Release|Win32
- {470832FD-33D6-4F31-AD06-BB7838371077}.ReleaseSym|Win32.ActiveCfg = ReleaseSym|Win32
- {470832FD-33D6-4F31-AD06-BB7838371077}.ReleaseSym|Win32.Build.0 = ReleaseSym|Win32
{D4779B0F-266B-46D3-8BCF-0E14EF8B817B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D4779B0F-266B-46D3-8BCF-0E14EF8B817B}.Debug|Win32.Build.0 = Debug|Win32
{D4779B0F-266B-46D3-8BCF-0E14EF8B817B}.Release|Win32.ActiveCfg = Release|Win32
{D4779B0F-266B-46D3-8BCF-0E14EF8B817B}.ReleaseSym|Win32.ActiveCfg = Release|Win32
{D4779B0F-266B-46D3-8BCF-0E14EF8B817B}.ReleaseSym|Win32.Build.0 = Release|Win32
Modified: sandbox/monotonic/libs/monotonic/test/monotonic.vcproj
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/monotonic.vcproj (original)
+++ sandbox/monotonic/libs/monotonic/test/monotonic.vcproj 2009-06-23 04:07:35 EDT (Tue, 23 Jun 2009)
@@ -315,38 +315,38 @@
>
</File>
<Filter
- Name="extra"
+ Name="container"
>
<File
- RelativePath="..\..\..\boost\monotonic\extra\chain.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\chain.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\inline_clone_allocator.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\inline_clone_allocator.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\list.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\list.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\map.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\map.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\ptr_list.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\ptr_list.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\set.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\set.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\string.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\string.hpp"
>
</File>
<File
- RelativePath="..\..\..\boost\monotonic\extra\vector.hpp"
+ RelativePath="..\..\..\boost\monotonic\container\vector.hpp"
>
</File>
</Filter>
@@ -407,17 +407,6 @@
<File
RelativePath=".\compare_memory_pool.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\Jamfile.v2"
- >
</File>
<File
RelativePath=".\PoolResult.h"
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