|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63784 - branches/release/libs/serialization branches/release/libs/serialization/doc branches/release/libs/serialization/example branches/release/libs/serialization/src branches/release/libs/serialization/test branches/release/libs/serialization/vc7ide trunk/libs/serialization/test
From: ramey_at_[hidden]
Date: 2010-07-09 14:23:25
Author: ramey
Date: 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
New Revision: 63784
URL: http://svn.boost.org/trac/boost/changeset/63784
Log:
Merge to release
Added:
branches/release/libs/serialization/vc7ide/test_diamond_complex.vcproj
- copied unchanged from r63780, /trunk/libs/serialization/vc7ide/test_diamond_complex.vcproj
Properties modified:
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/test/ (props changed)
branches/release/libs/serialization/test/A.cpp (props changed)
branches/release/libs/serialization/test/A.hpp (contents, props changed)
branches/release/libs/serialization/test/A.ipp (props changed)
branches/release/libs/serialization/test/B.hpp (props changed)
branches/release/libs/serialization/test/C.hpp (props changed)
branches/release/libs/serialization/test/D.hpp (props changed)
branches/release/libs/serialization/test/J.hpp (props changed)
branches/release/libs/serialization/test/Jamfile.v2 (contents, props changed)
branches/release/libs/serialization/test/base.hpp (props changed)
branches/release/libs/serialization/test/binary_archive.hpp (props changed)
branches/release/libs/serialization/test/binary_warchive.hpp (props changed)
branches/release/libs/serialization/test/derived2.hpp (props changed)
branches/release/libs/serialization/test/dll_a.cpp (props changed)
branches/release/libs/serialization/test/dll_base.cpp (props changed)
branches/release/libs/serialization/test/dll_derived2.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_array_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_base.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_base.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived1.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived1.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived2.cpp (props changed)
branches/release/libs/serialization/test/polymorphic_derived2.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_text_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_text_warchive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_xml_archive.hpp (props changed)
branches/release/libs/serialization/test/polymorphic_xml_warchive.hpp (props changed)
branches/release/libs/serialization/test/portable_binary_archive.hpp (props changed)
branches/release/libs/serialization/test/test_array.cpp (props changed)
branches/release/libs/serialization/test/test_binary.cpp (props changed)
branches/release/libs/serialization/test/test_bitset.cpp (props changed)
branches/release/libs/serialization/test/test_check.cpp (props changed)
branches/release/libs/serialization/test/test_class_info_load.cpp (props changed)
branches/release/libs/serialization/test/test_class_info_save.cpp (contents, props changed)
branches/release/libs/serialization/test/test_codecvt_null.cpp (props changed)
branches/release/libs/serialization/test/test_complex.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail1.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail1_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail2.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail2_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail3.cpp (props changed)
branches/release/libs/serialization/test/test_const_load_fail3_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_pass.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn1.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn1_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn2.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn2_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn3.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn3_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn4.cpp (props changed)
branches/release/libs/serialization/test/test_const_save_warn4_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_contained_class.cpp (props changed)
branches/release/libs/serialization/test/test_cyclic_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_decl.hpp (props changed)
branches/release/libs/serialization/test/test_delete_pointer.cpp (props changed)
branches/release/libs/serialization/test/test_deque.cpp (props changed)
branches/release/libs/serialization/test/test_derived.cpp (props changed)
branches/release/libs/serialization/test/test_derived_class.cpp (props changed)
branches/release/libs/serialization/test/test_derived_class_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_diamond.cpp (props changed)
branches/release/libs/serialization/test/test_dll_exported.cpp (props changed)
branches/release/libs/serialization/test/test_dll_plugin.cpp (contents, props changed)
branches/release/libs/serialization/test/test_dll_simple.cpp (props changed)
branches/release/libs/serialization/test/test_exported.cpp (props changed)
branches/release/libs/serialization/test/test_inclusion.cpp (props changed)
branches/release/libs/serialization/test/test_iterators.cpp (props changed)
branches/release/libs/serialization/test/test_iterators_base64.cpp (props changed)
branches/release/libs/serialization/test/test_list.cpp (props changed)
branches/release/libs/serialization/test/test_list_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_map.cpp (props changed)
branches/release/libs/serialization/test/test_mi.cpp (props changed)
branches/release/libs/serialization/test/test_mult_archive_types.cpp (props changed)
branches/release/libs/serialization/test/test_multiple_inheritance.cpp (props changed)
branches/release/libs/serialization/test/test_multiple_ptrs.cpp (props changed)
branches/release/libs/serialization/test/test_new_operator.cpp (props changed)
branches/release/libs/serialization/test/test_no_rtti.cpp (contents, props changed)
branches/release/libs/serialization/test/test_non_default_ctor.cpp (props changed)
branches/release/libs/serialization/test/test_non_default_ctor2.cpp (props changed)
branches/release/libs/serialization/test/test_non_intrusive.cpp (props changed)
branches/release/libs/serialization/test/test_not_serializable.cpp (props changed)
branches/release/libs/serialization/test/test_null_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_nvp.cpp (props changed)
branches/release/libs/serialization/test/test_object.cpp (props changed)
branches/release/libs/serialization/test/test_optional.cpp (props changed)
branches/release/libs/serialization/test/test_pimpl.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2.hpp (props changed)
branches/release/libs/serialization/test/test_polymorphic2imp.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic_A.cpp (props changed)
branches/release/libs/serialization/test/test_polymorphic_A.hpp (props changed)
branches/release/libs/serialization/test/test_primitive.cpp (props changed)
branches/release/libs/serialization/test/test_private_base.cpp (props changed)
branches/release/libs/serialization/test/test_private_ctor.cpp (props changed)
branches/release/libs/serialization/test/test_recursion.cpp (props changed)
branches/release/libs/serialization/test/test_registered.cpp (props changed)
branches/release/libs/serialization/test/test_reset_object_address.cpp (props changed)
branches/release/libs/serialization/test/test_set.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr_132.cpp (props changed)
branches/release/libs/serialization/test/test_shared_ptr_multi_base.cpp (props changed)
branches/release/libs/serialization/test/test_simple_class.cpp (contents, props changed)
branches/release/libs/serialization/test/test_simple_class_ptr.cpp (props changed)
branches/release/libs/serialization/test/test_singleton.cpp (props changed)
branches/release/libs/serialization/test/test_smart_cast.cpp (props changed)
branches/release/libs/serialization/test/test_split.cpp (props changed)
branches/release/libs/serialization/test/test_static_warning.cpp (props changed)
branches/release/libs/serialization/test/test_tools.hpp (props changed)
branches/release/libs/serialization/test/test_tracking.cpp (props changed)
branches/release/libs/serialization/test/test_traits_fail.cpp (props changed)
branches/release/libs/serialization/test/test_traits_pass.cpp (props changed)
branches/release/libs/serialization/test/test_unregistered.cpp (props changed)
branches/release/libs/serialization/test/test_utf8_codecvt.cpp (props changed)
branches/release/libs/serialization/test/test_valarray.cpp (props changed)
branches/release/libs/serialization/test/test_variant.cpp (props changed)
branches/release/libs/serialization/test/test_vector.cpp (props changed)
branches/release/libs/serialization/test/test_void_cast.cpp (props changed)
branches/release/libs/serialization/test/text_archive.hpp (props changed)
branches/release/libs/serialization/test/text_warchive.hpp (props changed)
branches/release/libs/serialization/test/xml_archive.hpp (props changed)
branches/release/libs/serialization/test/xml_warchive.hpp (props changed)
trunk/libs/serialization/test/test_diamond_complex.cpp (props changed)
Text files modified:
branches/release/libs/serialization/doc/acknowledgments.html | 2
branches/release/libs/serialization/doc/exceptions.html | 14 +
branches/release/libs/serialization/doc/extended_type_info.html | 6
branches/release/libs/serialization/doc/faq.html | 20 +-
branches/release/libs/serialization/doc/release.html | 13 +
branches/release/libs/serialization/example/demo_portable_archive.cpp | 2
branches/release/libs/serialization/example/demo_shared_ptr.cpp | 2
branches/release/libs/serialization/example/demo_trivial_archive.cpp | 2
branches/release/libs/serialization/example/log_archive.hpp | 2
branches/release/libs/serialization/example/portable_binary_iarchive.cpp | 10
branches/release/libs/serialization/example/portable_binary_iarchive.hpp | 22 ++
branches/release/libs/serialization/example/portable_binary_oarchive.cpp | 7
branches/release/libs/serialization/example/simple_log_archive.hpp | 7
branches/release/libs/serialization/src/archive_exception.cpp | 10
branches/release/libs/serialization/src/basic_archive.cpp | 8
branches/release/libs/serialization/src/basic_iarchive.cpp | 29 --
branches/release/libs/serialization/src/basic_oarchive.cpp | 17 -
branches/release/libs/serialization/src/basic_serializer_map.cpp | 5
branches/release/libs/serialization/src/basic_xml_grammar.ipp | 8
branches/release/libs/serialization/src/extended_type_info_typeid.cpp | 2
branches/release/libs/serialization/src/void_cast.cpp | 22 +
branches/release/libs/serialization/test/A.hpp | 1
branches/release/libs/serialization/test/Jamfile.v2 | 1
branches/release/libs/serialization/test/test_class_info_save.cpp | 5
branches/release/libs/serialization/test/test_dll_plugin.cpp | 10
branches/release/libs/serialization/test/test_no_rtti.cpp | 3
branches/release/libs/serialization/test/test_simple_class.cpp | 45 +++++
branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln | 340 +++++++++++++++++++++++++++++++++++++++
branches/release/libs/serialization/vc7ide/Library.vcproj | 20 +
branches/release/libs/serialization/vc7ide/LibraryW.vcproj | 15
branches/release/libs/serialization/vc7ide/test_array.vcproj | 3
branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj | 2
branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj | 2
branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj | 2
branches/release/libs/serialization/vc7ide/test_optional.vcproj | 2
branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj | 2
branches/release/libs/serialization/vc7ide/test_simple_class.vcproj | 59 ------
branches/release/libs/serialization/vc7ide/test_vector.vcproj | 2
38 files changed, 544 insertions(+), 180 deletions(-)
Modified: branches/release/libs/serialization/doc/acknowledgments.html
==============================================================================
--- branches/release/libs/serialization/doc/acknowledgments.html (original)
+++ branches/release/libs/serialization/doc/acknowledgments.html 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -27,6 +27,8 @@
</table>
<hr>
<ul>
+ <li>Takatoshi Kondo found and corrected a very obscure and difficult bug in the
+ serialization of virtual base classes.
<li>AutoForm Engineering GmbH supported
development efforts to extend correct serialization to objects stored in DLLS.
<li><a href"http://www.cadence.com/il">Cadence Israel</a> supported enhancement
Modified: branches/release/libs/serialization/doc/exceptions.html
==============================================================================
--- branches/release/libs/serialization/doc/exceptions.html (original)
+++ branches/release/libs/serialization/doc/exceptions.html 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -33,7 +33,8 @@
<dt>pointer_conflict
<dt>incompatible_native_format
<dt>array_size_too_short
- <dt>stream_error
+ <dt>input_stream_error
+ <dt>output_stream_error
<dt>invalid_class_name
<dt>unregistered_class
<dt>multiple_code_instantiation
@@ -70,7 +71,7 @@
incompatible_native_format, // attempt to read native binary format
// on incompatible platform
array_size_too_short, // array being loaded doesn't fit in array allocated
- stream_error // i/o error on stream
+ input_stream_error // error on stream input
invalid_class_name, // class name greater than the maximum permitted.
// most likely a corrupted archive or an attempt
// to insert virus via buffer overrun method.
@@ -79,8 +80,9 @@
unsupported_class_version, // type saved with a version # greater than the
// one used by the program. This indicates that the proggram
// needs to be rebuilt.
- multiple_code_instantiation // code for implementing serialization for some
+ multiple_code_instantiation, // code for implementing serialization for some
// type has been instantiated in more than one module.
+ output_stream_error // error on stream output
} exception_code;
exception_code code;
archive_exception(exception_code c) : code(c) {}
@@ -177,7 +179,11 @@
This should only occur when the size of an array in code is reduced after an
archive has already been created.
-<h3><a name="stream_error"><code style="white-space: normal">stream_error</code></a></h3>
+<h3>
+<a name="input_stream_error"><code style="white-space: normal">input_stream_error</code></a>
+<br>
+<a name="output_stream_error"><code style="white-space: normal">output_stream_error</code></a>
+</h3>
An error has occured during stream input or ouput. Aside from the common
situations such as a corrupted or truncated input file, there are
several less obvious ones that sometimes occur.
Modified: branches/release/libs/serialization/doc/extended_type_info.html
==============================================================================
--- branches/release/libs/serialization/doc/extended_type_info.html (original)
+++ branches/release/libs/serialization/doc/extended_type_info.html 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -269,7 +269,7 @@
instance that corresponds to
the "true type" of the type T. The "true type" is the lowest type in the
hierarchy of classes. The type T can always be cast to the "true type" with
-a static cast. Implemention of this function will vary among type id systems
+a static cast. Implementation of this function will vary among type id systems
and sometimes will make presumptions about the type T than can be identified
with a particular <code style="white-space: normal">extended_type_info</code> implementation.
</dd>
@@ -321,7 +321,7 @@
<h3><a name="models">Models</a></h3>
The serialization library includes two distinct
<code style="white-space: normal"><a target="extended_type_info.hpp" href="../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
-implementatio's.
+implementations.
<p>
<code style="white-space: normal"><h4><a target="extended_type_info_typeid.hpp" href = "../../../boost/serialization/extended_type_info_typeid.hpp">
extended_type_info_typeid</a></h4></code>is implemented in terms of the standard typeid(). It presumes that RTTI support is enabled
@@ -408,7 +408,7 @@
A complete example of this can be found
-<a target="test_plugin.cpp" href="test_plugin.cpp">here</a>
+<a target="test_dll_plugin.cpp" href="../test/test_dll_plugin.cpp">here</a>
<hr>
<p><i>© Copyright Robert Ramey 2005-2009.
Distributed under the Boost Software License, Version 1.0. (See
Modified: branches/release/libs/serialization/doc/faq.html
==============================================================================
--- branches/release/libs/serialization/doc/faq.html (original)
+++ branches/release/libs/serialization/doc/faq.html 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -38,16 +38,14 @@
is to create a "TRAK" item
which includes the text you want to add to this list.
- <ul>
- <li><h4>
- <a name="differences_1_37"></a>Differences from Boost 1.37</h2>
- </h4></li>
- </ul>
- <hr>
- <p>
- <i>© Copyright Robert Ramey 2002-2009. 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) </i>
- </p>
+<ul>
+<li><h4>
+</h4></li>
+</ul>
+<hr>
+<p>
+<i>© Copyright Robert Ramey 2002-2009. 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) </i></p>
</body>
</html>
Modified: branches/release/libs/serialization/doc/release.html
==============================================================================
--- branches/release/libs/serialization/doc/release.html (original)
+++ branches/release/libs/serialization/doc/release.html 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -1,6 +1,6 @@
<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
- <!--
+<!--
(C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com .
Use, modification and distribution is subject to the Boost Software
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -29,6 +29,7 @@
</table>
<hr>
<dl class="index">
+ <dt>Differences from version 1.43</dt>
<dt>Differences from version 1.42</dt>
<dt>Differences from version 1.41</dt>
<dt>Differences from version 1.40</dt>
@@ -43,6 +44,11 @@
As of this writing, there are no known bugs. However, due to compiler/library
quirks and or bugs, some tests fail with some combinations of compilers and
libraries.
+<h2><a name="differences_1_43"></a>Differences from Boost 1.43</h2>
+<ul>
+ <li>fixed bug in the serialization of virtual base classes. Due
+ to heroic efforts by Takatoshi Kondo.
+</ul>
<h2><a name="differences_1_42"></a>Differences from Boost 1.42</h2>
<ul>
<li>fixed failure of shared_ptr serialization when serializing pointers
@@ -216,7 +222,7 @@
<li>
Pointers to pointers cannot currently be serialized
<li>
- Its possible that <code style="white-space: normal">std::string</code> and <code style="white-space: normal">
+ It's possible that <code style="white-space: normal">std::string</code> and <code style="white-space: normal">
std::wstring</code>
contain characters such as '\0' and -1 (EOF) which cannot be rendered in text
and XML archives without an escape mechanism. Currently there is no such escape
@@ -227,6 +233,9 @@
serialization of <code style="white-space: normal">std::map</code>
for those compilers which do not support partial template specialization. Also,
types which contain pointers or tracked types might not work correctly.
+ <li>
+ Serialization of virtual base classes relies upon RTTI. It will fail when used on
+ systems which don't have RTTI enabled.
</ul>
<p>
Aside from the above, there are a number of issues related to specific
Modified: branches/release/libs/serialization/example/demo_portable_archive.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_portable_archive.cpp (original)
+++ branches/release/libs/serialization/example/demo_portable_archive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -27,6 +27,7 @@
{
friend class boost::serialization::access;
char c;
+ A *pa;
int i;
int i2; // special tricky case to check sign extension
unsigned int ui;
@@ -49,6 +50,7 @@
}
A() :
c(0xFF & std::rand()),
+ pa(0),
i(std::rand()),
i2(0x80),
ui(std::rand()),
Modified: branches/release/libs/serialization/example/demo_shared_ptr.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_shared_ptr.cpp (original)
+++ branches/release/libs/serialization/example/demo_shared_ptr.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -82,7 +82,7 @@
std::cout << "unique element count = " << A::count << std::endl;
}
-int main(int /* argc */, char /* *argv[] */)
+int main(int /* argc */, char * /*argv*/[])
{
std::string filename(boost::archive::tmpdir());
filename += "/testfile";
Modified: branches/release/libs/serialization/example/demo_trivial_archive.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_trivial_archive.cpp (original)
+++ branches/release/libs/serialization/example/demo_trivial_archive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -20,7 +20,7 @@
// serialization library
typedef boost::mpl::bool_<true> is_saving;
typedef boost::mpl::bool_<false> is_loading;
- template<class T> register_type(){}
+ template<class T> void register_type(){}
template<class T> trivial_oarchive & operator<<(const T & t){
return *this;
}
Modified: branches/release/libs/serialization/example/log_archive.hpp
==============================================================================
--- branches/release/libs/serialization/example/log_archive.hpp (original)
+++ branches/release/libs/serialization/example/log_archive.hpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -30,7 +30,7 @@
// give serialization implementation access to this clas
friend class boost::archive::detail::interface_oarchive<log_archive>;
friend class boost::archive::basic_xml_oarchive<log_archive>;
- friend boost::archive::save_access;
+ friend class boost::archive::save_access;
/////////////////////////////////////////////////////////////////////
// Override functions defined in basic_xml_oarchive
Modified: branches/release/libs/serialization/example/portable_binary_iarchive.cpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_iarchive.cpp (original)
+++ branches/release/libs/serialization/example/portable_binary_iarchive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -84,11 +84,11 @@
);
// make sure the version of the reading archive library can
// support the format of the archive being read
- boost::archive::version_type input_library_version;
+ boost::archive::library_version_type input_library_version;
* this >> input_library_version;
// extra little .t is to get around borland quirk
- if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version.t)
+ if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version)
boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::unsupported_version
@@ -111,12 +111,16 @@
m_flags = x << CHAR_BIT;
}
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/impl/basic_binary_iprimitive.ipp>
-
namespace boost {
namespace archive {
+namespace detail {
+ template class archive_serializer_map<portable_binary_iarchive>;
+}
+
template class basic_binary_iprimitive<
portable_binary_iarchive,
std::istream::char_type,
Modified: branches/release/libs/serialization/example/portable_binary_iarchive.hpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_iarchive.hpp (original)
+++ branches/release/libs/serialization/example/portable_binary_iarchive.hpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -23,6 +23,7 @@
#include <istream>
#include <boost/serialization/string.hpp>
+#include <boost/serialization/item_version_type.hpp>
#include <boost/archive/archive_exception.hpp>
#include <boost/archive/basic_binary_iprimitive.hpp>
#include <boost/archive/detail/common_iarchive.hpp>
@@ -104,7 +105,26 @@
boost::intmax_t l;
load_impl(l, sizeof(T));
// use cast to avoid compile time warning
- t = static_cast<T>(l);
+ //t = static_cast<T>(l);
+ t = T(l);
+ }
+ void load(boost::serialization::item_version_type & t){
+ boost::intmax_t l;
+ load_impl(l, sizeof(boost::serialization::item_version_type));
+ // use cast to avoid compile time warning
+ t = boost::serialization::item_version_type(l);
+ }
+ void load(boost::archive::version_type & t){
+ boost::intmax_t l;
+ load_impl(l, sizeof(boost::archive::version_type));
+ // use cast to avoid compile time warning
+ t = boost::archive::version_type(l);
+ }
+ void load(boost::archive::class_id_type & t){
+ boost::intmax_t l;
+ load_impl(l, sizeof(boost::archive::class_id_type));
+ // use cast to avoid compile time warning
+ t = boost::archive::class_id_type(static_cast<int>(l));
}
void load(std::string & t){
this->primitive_base_t::load(t);
Modified: branches/release/libs/serialization/example/portable_binary_oarchive.cpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_oarchive.cpp (original)
+++ branches/release/libs/serialization/example/portable_binary_oarchive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -70,7 +70,7 @@
);
* this << file_signature;
// write library version
- const boost::archive::version_type v(
+ const boost::archive::library_version_type v(
boost::archive::BOOST_ARCHIVE_VERSION()
);
* this << v;
@@ -78,11 +78,16 @@
save(static_cast<unsigned char>(m_flags >> CHAR_BIT));
}
+#include <boost/archive/impl/archive_serializer_map.ipp>
#include <boost/archive/impl/basic_binary_oprimitive.ipp>
namespace boost {
namespace archive {
+namespace detail {
+ template class archive_serializer_map<portable_binary_oarchive>;
+}
+
template class basic_binary_oprimitive<
portable_binary_oarchive,
std::ostream::char_type,
Modified: branches/release/libs/serialization/example/simple_log_archive.hpp
==============================================================================
--- branches/release/libs/serialization/example/simple_log_archive.hpp (original)
+++ branches/release/libs/serialization/example/simple_log_archive.hpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -133,12 +133,13 @@
}
template<class T, int N>
simple_log_archive & operator<<(const T (&t)[N]){
- ar << serialization::make_array(
- static_cast<value_type const*>(&t[0]),count
+ return *this << boost::serialization::make_array(
+ static_cast<const T *>(&t[0]),
+ N
);
}
template<class T>
- simple_log_archive & operator<<(const ::boost::serialization::nvp<T> & t){
+ simple_log_archive & operator<<(const boost::serialization::nvp<T> & t){
m_os << '\n'; // start line with each named object
// indent according to object depth
for(unsigned int i = 0; i < m_depth; ++i)
Modified: branches/release/libs/serialization/src/archive_exception.cpp
==============================================================================
--- branches/release/libs/serialization/src/archive_exception.cpp (original)
+++ branches/release/libs/serialization/src/archive_exception.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -61,8 +61,8 @@
case array_size_too_short:
m_msg = "array size too short";
break;
- case stream_error:
- m_msg = "stream error";
+ case input_stream_error:
+ m_msg = "input stream error";
break;
case invalid_class_name:
m_msg = "class name too long";
@@ -74,7 +74,8 @@
m_msg += (NULL != e2) ? e2 : "?";
break;
case unsupported_class_version:
- m_msg = "class version";
+ m_msg = "class version ";
+ m_msg += (NULL != e1) ? e1 : "<unknown class>";
break;
case other_exception:
// if get here - it indicates a derived exception
@@ -88,6 +89,9 @@
m_msg += e1;
}
break;
+ case output_stream_error:
+ m_msg = "output stream error";
+ break;
default:
assert(false);
break;
Modified: branches/release/libs/serialization/src/basic_archive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_archive.cpp (original)
+++ branches/release/libs/serialization/src/basic_archive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -53,15 +53,17 @@
// 2 - made address tracking optional
// 3 - numerous changes - can't guarentee compatibility with previous versions
// 4 - Boost 1.34
-// added register_version to properly support versioning for collections
+// added item_version to properly support versioning for collections
// 5 - Boost 1.36
// changed serialization of collections: adding version even for primitive
// types caused backwards compatibility breaking change in 1.35
// 6 - Boost 1.41, serializing collection sizes as std::size_t
+// 7 - separated version_type into library_version_type and class_version_type
+// changed version_type to be stored as 8 bits.
-BOOST_ARCHIVE_DECL(version_type)
+BOOST_ARCHIVE_DECL(library_version_type)
BOOST_ARCHIVE_VERSION(){
- return version_type(7);
+ return library_version_type(7);
}
} // namespace archive
Modified: branches/release/libs/serialization/src/basic_iarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_iarchive.cpp (original)
+++ branches/release/libs/serialization/src/basic_iarchive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -29,7 +29,6 @@
#include <boost/serialization/tracking.hpp>
#define BOOST_ARCHIVE_SOURCE
-#define BOOST_SERIALIZATION_SOURCE
#include <boost/archive/archive_exception.hpp>
@@ -49,7 +48,7 @@
class basic_iarchive_impl {
friend class basic_iarchive;
- version_type m_archive_library_version;
+ library_version_type m_archive_library_version;
unsigned int m_flags;
//////////////////////////////////////////////////////////////////////
@@ -172,7 +171,7 @@
pending_version(0)
{}
~basic_iarchive_impl(){}
- void set_library_version(version_type archive_library_version){
+ void set_library_version(library_version_type archive_library_version){
m_archive_library_version = archive_library_version;
}
bool
@@ -291,14 +290,7 @@
basic_iarchive_impl::register_type(
const basic_iserializer & bis
){
- assert(
- cobject_info_set.size()
- <=
- boost::integer_traits<class_id_type>::const_max
- );
- class_id_type cid(static_cast<class_id_type>(
- cobject_info_set.size()
- ));
+ class_id_type cid(cobject_info_set.size());
cobject_type co(cid, bis);
std::pair<cobject_info_set_type::const_iterator, bool>
result = cobject_info_set.insert(co);
@@ -322,7 +314,7 @@
){
if(! co.initialized){
if(co.bis_ptr->class_info()){
- class_id_optional_type cid;
+ class_id_optional_type cid(class_id_type(0));
load(ar, cid); // to be thrown away
load(ar, co.tracking_level);
load(ar, co.file_version);
@@ -382,7 +374,7 @@
object_id_type this_id;
moveable_objects_start =
- this_id = object_id_vector.size();
+ this_id = object_id_type(object_id_vector.size());
// if we tracked this object when the archive was saved
if(tracking){
@@ -393,7 +385,7 @@
// add a new enty into the tracking list
object_id_vector.push_back(aobject(t, cid));
// and add an entry for this object
- moveable_objects_end = object_id_vector.size();
+ moveable_objects_end = object_id_type(object_id_vector.size());
}
// read data
(bis.load_object_data)(ar, t, co.file_version);
@@ -418,11 +410,6 @@
return bpis_ptr;
}
- assert(
- cobject_info_set.size()
- <=
- boost::integer_traits<class_id_type>::const_max
- );
// if its a new class type - i.e. never been registered
if(class_id_type(cobject_info_set.size()) <= cid){
// if its either abstract
@@ -527,7 +514,7 @@
}
BOOST_ARCHIVE_DECL(void)
-basic_iarchive::set_library_version(version_type archive_library_version){
+basic_iarchive::set_library_version(library_version_type archive_library_version){
pimpl->set_library_version(archive_library_version);
}
@@ -571,7 +558,7 @@
pimpl->delete_created_pointers();
}
-BOOST_ARCHIVE_DECL(unsigned int)
+BOOST_ARCHIVE_DECL(boost::archive::library_version_type)
basic_iarchive::get_library_version() const{
return pimpl->m_archive_library_version;
}
Modified: branches/release/libs/serialization/src/basic_oarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_oarchive.cpp (original)
+++ branches/release/libs/serialization/src/basic_oarchive.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -21,7 +21,6 @@
// including this here to work around an ICC in intel 7.0
// normally this would be part of basic_oarchive.hpp below.
#define BOOST_ARCHIVE_SOURCE
-#define BOOST_SERIALIZATION_SOURCE
#include <boost/archive/detail/decl.hpp>
#include <boost/archive/basic_archive.hpp>
@@ -100,9 +99,7 @@
const basic_oserializer & bos
) :
m_bos_ptr(& bos),
- m_class_id(
- static_cast<class_id_type>(class_id)
- ),
+ m_class_id(class_id),
m_initialized(false)
{}
cobject_type(const basic_oserializer & bos)
@@ -226,11 +223,6 @@
inline const basic_oarchive_impl::cobject_type &
basic_oarchive_impl::find(const basic_oserializer & bos)
{
- assert(
- cobject_info_set.size()
- <=
- boost::integer_traits<class_id_type>::const_max
- );
std::pair<cobject_info_set_type::iterator, bool> cresult =
cobject_info_set.insert(cobject_type(cobject_info_set.size(), bos));
return *(cresult.first);
@@ -240,11 +232,6 @@
basic_oarchive_impl::register_type(
const basic_oserializer & bos
){
- assert(
- cobject_info_set.size()
- <=
- boost::integer_traits<class_id_type>::const_max
- );
cobject_type co(cobject_info_set.size(), bos);
std::pair<cobject_info_set_type::const_iterator, bool>
result = cobject_info_set.insert(co);
@@ -446,7 +433,7 @@
pimpl->register_type(bos);
}
-BOOST_ARCHIVE_DECL(unsigned int)
+BOOST_ARCHIVE_DECL(library_version_type)
basic_oarchive::get_library_version() const{
return BOOST_ARCHIVE_VERSION();
}
Modified: branches/release/libs/serialization/src/basic_serializer_map.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_serializer_map.cpp (original)
+++ branches/release/libs/serialization/src/basic_serializer_map.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -94,7 +94,10 @@
const basic_serializer_arg bs(eti);
map_type::const_iterator it;
it = m_map.find(& bs);
- assert(it != m_map.end());
+ if(it == m_map.end()){
+ assert(false);
+ return 0;
+ }
return *it;
}
Modified: branches/release/libs/serialization/src/basic_xml_grammar.ipp
==============================================================================
--- branches/release/libs/serialization/src/basic_xml_grammar.ipp (original)
+++ branches/release/libs/serialization/src/basic_xml_grammar.ipp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -181,7 +181,7 @@
) const {
if(is.fail()){
boost::serialization::throw_exception(
- archive_exception(archive_exception::stream_error)
+ archive_exception(archive_exception::input_stream_error)
);
}
@@ -321,7 +321,7 @@
str_p(BOOST_ARCHIVE_XML_CLASS_ID()) >> NameTail
>> Eq
>> L'"'
- >> int_p [xml::assign_object(rv.class_id.t)]
+ >> int_p [xml::assign_object(rv.class_id)]
>> L'"'
;
@@ -334,7 +334,7 @@
>> Eq
>> L'"'
>> L'_'
- >> uint_p [xml::assign_object(rv.object_id.t)]
+ >> uint_p [xml::assign_object(rv.object_id)]
>> L'"'
;
@@ -372,7 +372,7 @@
str_p(BOOST_ARCHIVE_XML_VERSION())
>> Eq
>> L'"'
- >> uint_p [xml::assign_object(rv.version.t)]
+ >> uint_p [xml::assign_object(rv.version)]
>> L'"'
;
Modified: branches/release/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- branches/release/libs/serialization/src/extended_type_info_typeid.cpp (original)
+++ branches/release/libs/serialization/src/extended_type_info_typeid.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -72,7 +72,7 @@
BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
extended_type_info_typeid_0::extended_type_info_typeid_0(
- const char * key
+ const char * key
) :
extended_type_info(EXTENDED_TYPE_INFO_TYPE_KEY, key),
m_ti(NULL)
Modified: branches/release/libs/serialization/src/void_cast.cpp
==============================================================================
--- branches/release/libs/serialization/src/void_cast.cpp (original)
+++ branches/release/libs/serialization/src/void_cast.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -28,8 +28,6 @@
// BOOST
#define BOOST_SERIALIZATION_SOURCE
#include <boost/serialization/singleton.hpp>
-
-#define BOOST_SERIALIZATION_SOURCE
#include <boost/serialization/extended_type_info.hpp>
#include <boost/serialization/void_cast.hpp>
@@ -100,6 +98,9 @@
virtual bool is_shortcut() const {
return true;
}
+ virtual bool has_virtual_base() const {
+ return m_includes_virtual_base;
+ }
public:
void_caster_shortcut(
extended_type_info const * derived,
@@ -192,6 +193,10 @@
assert(false);
return NULL;
}
+ virtual bool has_virtual_base() const {
+ assert(false);
+ return false;
+ }
public:
void_caster_argument(
extended_type_info const * derived,
@@ -239,7 +244,7 @@
(*it)->m_derived,
m_base,
m_difference + (*it)->m_difference,
- includes_virtual_base,
+ (*it)->has_virtual_base() || includes_virtual_base,
this
);
}
@@ -256,7 +261,7 @@
m_derived,
(*it)->m_base,
m_difference + (*it)->m_difference,
- includes_virtual_base,
+ (*it)->has_virtual_base() || includes_virtual_base,
this
);
}
@@ -284,10 +289,6 @@
void_cast_detail::set_type::iterator it;
for(it = s.begin(); it != s.end();){
const void_caster * vc = *it;
- if(vc == this){
- s.erase(it++);
- }
- else
if(vc->m_parent == this){
s.erase(it);
delete vc;
@@ -296,6 +297,11 @@
else
it++;
}
+
+ // delete this guy if he's in there
+ it = s.find(this);
+ if(it != s.end())
+ s.erase(it);
}
} // namespace void_cast_detail
Modified: branches/release/libs/serialization/test/A.hpp
==============================================================================
--- branches/release/libs/serialization/test/A.hpp (original)
+++ branches/release/libs/serialization/test/A.hpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -145,6 +145,7 @@
#endif
public:
A();
+ bool check_equal(const A &rhs) const;
bool operator==(const A &rhs) const;
bool operator!=(const A &rhs) const;
bool operator<(const A &rhs) const; // used by less
Modified: branches/release/libs/serialization/test/Jamfile.v2
==============================================================================
--- branches/release/libs/serialization/test/Jamfile.v2 (original)
+++ branches/release/libs/serialization/test/Jamfile.v2 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -71,6 +71,7 @@
[ test-bsl-run_files test_derived_class : A ]
[ test-bsl-run_files test_derived_class_ptr : A ]
[ test-bsl-run_files test_diamond ]
+ [ test-bsl-run_files test_diamond_complex ]
[ test-bsl-run_files test_exported : polymorphic_base ]
[ test-bsl-run_files test_class_info_load ]
[ test-bsl-run_files test_class_info_save ]
Modified: branches/release/libs/serialization/test/test_class_info_save.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_class_info_save.cpp (original)
+++ branches/release/libs/serialization/test/test_class_info_save.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -52,7 +52,10 @@
template<class Archive>
void serialize(Archive & /*ar*/, const unsigned int file_version){
// verify at execution that correct version number is passed on save
- BOOST_CHECK(file_version == ::boost::serialization::version<B>::value);
+ BOOST_CHECK(
+ static_cast<const int>(file_version)
+ == ::boost::serialization::version<B>::value
+ );
++count;
}
public:
Modified: branches/release/libs/serialization/test/test_dll_plugin.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_dll_plugin.cpp (original)
+++ branches/release/libs/serialization/test/test_dll_plugin.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -1,5 +1,5 @@
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// test_plugin.cpp
+// test_dll_plugin.cpp
// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
// Use, modification and distribution is subject to the Boost Software
@@ -155,6 +155,7 @@
#ifdef BOOST_WINDOWS
#define WIN32_LEAN_AND_MEAN
+#include <TCHAR.H>
#include <windows.h>
int
@@ -164,8 +165,11 @@
BOOST_REQUIRE(NULL != testfile);
HINSTANCE hDLL; // Handle to DLL
- hDLL = LoadLibrary("plugin_polymorphic_derived2.dll");
- BOOST_CHECK_MESSAGE((0 != hDLL), "Failed to find/load plugin_polymorphic_derived2" );
+ hDLL = LoadLibrary(_T("plugin_polymorphic_derived2.dll"));
+ BOOST_CHECK_MESSAGE(
+ (0 != hDLL),
+ "Failed to find/load plugin_polymorphic_derived2"
+ );
if(0 == hDLL)
return EXIT_FAILURE;
Modified: branches/release/libs/serialization/test/test_no_rtti.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_no_rtti.cpp (original)
+++ branches/release/libs/serialization/test/test_no_rtti.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -26,9 +26,6 @@
}
#endif
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
#include <boost/archive/archive_exception.hpp>
#include <boost/serialization/type_info_implementation.hpp>
Modified: branches/release/libs/serialization/test/test_simple_class.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_simple_class.cpp (original)
+++ branches/release/libs/serialization/test/test_simple_class.cpp 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -13,6 +13,7 @@
#include <cstddef> // NULL
#include <cstdio> // remove
#include <fstream>
+#include <cmath>
#include <boost/config.hpp>
@@ -27,6 +28,48 @@
#include "A.hpp"
#include "A.ipp"
+bool A::check_equal(const A &rhs) const
+{
+ BOOST_CHECK_EQUAL(b, rhs.b);
+ BOOST_CHECK_EQUAL(l, rhs.l);
+ #ifndef BOOST_NO_INT64_T
+ BOOST_CHECK_EQUAL(f, rhs.f);
+ BOOST_CHECK_EQUAL(g, rhs.g);
+ #endif
+ BOOST_CHECK_EQUAL(m, rhs.m);
+ BOOST_CHECK_EQUAL(n, rhs.n);
+ BOOST_CHECK_EQUAL(o, rhs.o);
+ BOOST_CHECK_EQUAL(p, rhs.p);
+ BOOST_CHECK_EQUAL(q, rhs.q);
+ #ifndef BOOST_NO_CWCHAR
+ BOOST_CHECK_EQUAL(r, rhs.r);
+ #endif
+ BOOST_CHECK_EQUAL(c, rhs.c);
+ BOOST_CHECK_EQUAL(s, rhs.s);
+ BOOST_CHECK_EQUAL(t, rhs.t);
+ BOOST_CHECK_EQUAL(u, rhs.u);
+ BOOST_CHECK_EQUAL(v, rhs.v);
+ BOOST_CHECK_EQUAL(l, rhs.l);
+ BOOST_CHECK(!(
+ w == 0
+ && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon()
+ ));
+ BOOST_CHECK(!(
+ std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon()
+ ));
+ BOOST_CHECK(!(
+ x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon()
+ ));
+ BOOST_CHECK(!(
+ std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon()
+ ));
+ BOOST_CHECK(!(0 != y.compare(rhs.y)));
+ #ifndef BOOST_NO_STD_WSTRING
+ BOOST_CHECK(!(0 != z.compare(rhs.z)));
+ #endif
+ return true;
+}
+
int
test_main( int /* argc */, char* /* argv */[] )
{
@@ -44,7 +87,7 @@
test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
ia >> boost::serialization::make_nvp("a", a1);
}
- BOOST_CHECK_EQUAL(a, a1);
+ a.check_equal(a1);
std::remove(testfile);
return 0;
}
Modified: branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln
==============================================================================
--- branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln (original)
+++ branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -231,6 +231,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_zmisc", "test_zmisc.vcproj", "{FF315430-555F-44D8-9EA0-587AF1479020}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shared_ptr_multi_base", "test_shared_ptr_multi_base.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -295,6 +299,74 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_list", "test_list.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_binary", "test_binary.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_class_info_load", "test_class_info_load.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_class_info_save", "test_class_info_save.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_contained_class", "test_contained_class.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cyclic_ptrs", "test_cyclic_ptrs.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_delete_pointer", "test_delete_pointer.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_deque", "test_deque.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_derived_class_ptr", "test_derived_class_ptr.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_diamond", "test_diamond.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "test_iterators.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators_base64", "test_iterators_base64.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_list_ptrs", "test_list_ptrs.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mult_archive_types", "test_mult_archive_types.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_singleton", "test_singleton.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_smart_cast", "test_smart_cast.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_diamond_complex", "test_diamond_complex.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -446,20 +518,20 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1118,6 +1190,20 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug.ActiveCfg = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug.Build.0 = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release.ActiveCfg = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release.Build.0 = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-dynamic.ActiveCfg = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-dynamic.Build.0 = Debug runtime-static|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-static.ActiveCfg = Release runtime-dynamic|Win32
+ {FF315430-555F-44D8-9EA0-587AF1479020}.Release runtime-static.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
@@ -1342,6 +1428,244 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
..\test\Jamfile.v2 = ..\test\Jamfile.v2
Modified: branches/release/libs/serialization/vc7ide/Library.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/Library.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/Library.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -44,7 +44,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-gd-1_42.dll"
+ OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-gd-1_44.dll"
GenerateDebugInformation="TRUE"
GenerateMapFile="TRUE"/>
<Tool
@@ -95,7 +95,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-1_42.dll"
+ OutputFile="$(ConfigurationName)\boost_serialization-vc71-mt-1_44.dll"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
SubSystem="2"
@@ -155,7 +155,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_42.lib"/>
+ OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -208,7 +208,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_39.lib"/>
+ OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -297,6 +297,9 @@
RelativePath="..\..\..\boost\serialization\bitset.hpp">
</File>
<File
+ RelativePath="..\..\..\boost\serialization\collection_size_type.hpp">
+ </File>
+ <File
RelativePath="..\..\..\boost\serialization\collection_traits.hpp">
</File>
<File
@@ -327,6 +330,9 @@
RelativePath="..\..\..\boost\serialization\is_bitwise_serializable.hpp">
</File>
<File
+ RelativePath="..\..\..\boost\serialization\item_version_type.hpp">
+ </File>
+ <File
RelativePath="..\..\..\boost\serialization\list.hpp">
</File>
<File
@@ -360,6 +366,9 @@
RelativePath="..\..\..\boost\serialization\utility.hpp">
</File>
<File
+ RelativePath="..\..\..\boost\serialization\valarray.hpp">
+ </File>
+ <File
RelativePath="..\..\..\boost\serialization\variant.hpp">
</File>
<File
@@ -508,9 +517,6 @@
RelativePath="..\..\..\boost\archive\codecvt_null.hpp">
</File>
<File
- RelativePath="..\..\..\boost\serialization\collection_size_type.hpp">
- </File>
- <File
RelativePath="..\..\..\boost\serialization\config.hpp">
</File>
<File
Modified: branches/release/libs/serialization/vc7ide/LibraryW.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/LibraryW.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/LibraryW.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -43,8 +43,8 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="boost_serialization-vc71-mt-gd-1_42.lib"
- OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-gd-1_42.dll"
+ AdditionalDependencies="boost_serialization-vc71-mt-gd-1_44.lib"
+ OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-gd-1_44.dll"
AdditionalLibraryDirectories="$(ConfigurationName)"
GenerateDebugInformation="TRUE"
SupportUnloadOfDelayLoadedDLL="FALSE"/>
@@ -102,7 +102,8 @@
<Tool
Name="VCCustomBuildTool"/>
<Tool
- Name="VCLinkerTool"/>
+ Name="VCLinkerTool"
+ OutputFile="$(ConfigurationName)\boost_wserialization-vc71-mt-1_44.dll"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -155,7 +156,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)"/>
+ OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -207,7 +208,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)"/>
+ OutputFile="$(OutDir)/libboost_wserialization-vc71-s-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -260,7 +261,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)"/>
+ OutputFile="$(OutDir)/libboost_serialization-vc71-s-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -311,7 +312,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_41.lib"/>
+ OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1_44.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Modified: branches/release/libs/serialization/vc7ide/test_array.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_array.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_array.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -1762,7 +1762,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
BasicRuntimeChecks="0"
SmallerTypeCheck="FALSE"
RuntimeLibrary="3"
@@ -1770,6 +1770,7 @@
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
WarningLevel="4"
+ Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="1"/>
<Tool
Name="VCCustomBuildTool"/>
Modified: branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_class_info_load.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_warchive.hpp"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
Modified: branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_class_info_save.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_warchive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
Modified: branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_delete_pointer.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -88,7 +88,7 @@
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
WarningLevel="4"
- Detect64BitPortabilityProblems="FALSE"
+ Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="1"
CompileAs="0"/>
<Tool
Modified: branches/release/libs/serialization/vc7ide/test_optional.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_optional.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_optional.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_archive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
Modified: branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_polymorphic.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=polymorphic_text_archive.hpp"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=polymorphic_xml_warchive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
Modified: branches/release/libs/serialization/vc7ide/test_simple_class.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_simple_class.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_simple_class.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -25,9 +25,9 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
SmallerTypeCheck="FALSE"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
@@ -79,7 +79,7 @@
Optimization="2"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
SmallerTypeCheck="FALSE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
@@ -180,59 +180,6 @@
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
- <Configuration
- Name="Release runtime-dynamic|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
- SmallerTypeCheck="FALSE"
- RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="TRUE"
- TreatWChar_tAsBuiltInType="TRUE"
- ForceConformanceInForLoopScope="TRUE"
- RuntimeTypeInfo="TRUE"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- IgnoreImportLibrary="TRUE"
- LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="$(ConfigurationName)"
- GenerateDebugInformation="TRUE"
- SubSystem="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"
- Description="run $(TargetName) with $(ConfigurationName)"
- CommandLine=""$(TargetDir)/$(TargetName).exe""/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
</Configurations>
<References>
</References>
Modified: branches/release/libs/serialization/vc7ide/test_vector.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_vector.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/test_vector.vcproj 2010-07-09 14:23:21 EDT (Fri, 09 Jul 2010)
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
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