|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49158 - in branches/release: boost/archive boost/archive/detail boost/archive/impl boost/archive/iterators boost/serialization boost/serialization/detail libs/serialization/build libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide
From: ramey_at_[hidden]
Date: 2008-10-07 01:34:54
Author: ramey
Date: 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
New Revision: 49158
URL: http://svn.boost.org/trac/boost/changeset/49158
Log:
Merge serialization library from trunk to release-read
Added:
branches/release/boost/serialization/pfto.hpp
- copied unchanged from r49155, /trunk/boost/serialization/pfto.hpp
branches/release/boost/serialization/smart_cast.hpp
- copied unchanged from r49155, /trunk/boost/serialization/smart_cast.hpp
branches/release/boost/serialization/state_saver.hpp
- copied unchanged from r49155, /trunk/boost/serialization/state_saver.hpp
branches/release/boost/serialization/static_warning.hpp
- copied unchanged from r49155, /trunk/boost/serialization/static_warning.hpp
branches/release/boost/serialization/strong_typedef.hpp
- copied unchanged from r49155, /trunk/boost/serialization/strong_typedef.hpp
branches/release/boost/serialization/throw_exception.hpp
- copied unchanged from r49155, /trunk/boost/serialization/throw_exception.hpp
branches/release/libs/serialization/vc7ide/demo_dll.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/demo_dll.vcproj
branches/release/libs/serialization/vc7ide/dll_a.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/dll_a.vcproj
branches/release/libs/serialization/vc7ide/dll_base.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/dll_base.vcproj
branches/release/libs/serialization/vc7ide/dll_derived2.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/dll_derived2.vcproj
branches/release/libs/serialization/vc7ide/test_complex.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_complex.vcproj
branches/release/libs/serialization/vc7ide/test_dll_exported.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_dll_exported.vcproj
branches/release/libs/serialization/vc7ide/test_dll_plugin.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_dll_plugin.vcproj
branches/release/libs/serialization/vc7ide/test_dll_simple.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_dll_simple.vcproj
branches/release/libs/serialization/vc7ide/test_singleton.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_singleton.vcproj
branches/release/libs/serialization/vc7ide/test_strong_typedef.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_strong_typedef.vcproj
branches/release/libs/serialization/vc7ide/test_valarray.vcproj
- copied unchanged from r49157, /trunk/libs/serialization/vc7ide/test_valarray.vcproj
Text files modified:
branches/release/boost/archive/basic_archive.hpp | 6
branches/release/boost/archive/basic_binary_iarchive.hpp | 2
branches/release/boost/archive/basic_binary_iprimitive.hpp | 22
branches/release/boost/archive/basic_binary_oarchive.hpp | 2
branches/release/boost/archive/basic_binary_oprimitive.hpp | 22 +
branches/release/boost/archive/basic_text_iarchive.hpp | 2
branches/release/boost/archive/basic_text_iprimitive.hpp | 22 +
branches/release/boost/archive/basic_text_oarchive.hpp | 2
branches/release/boost/archive/basic_text_oprimitive.hpp | 42 +
branches/release/boost/archive/basic_xml_archive.hpp | 16
branches/release/boost/archive/basic_xml_iarchive.hpp | 2
branches/release/boost/archive/binary_iarchive_impl.hpp | 2
branches/release/boost/archive/binary_oarchive_impl.hpp | 2
branches/release/boost/archive/detail/abi_suffix.hpp | 8
branches/release/boost/archive/detail/common_iarchive.hpp | 2
branches/release/boost/archive/detail/iserializer.hpp | 15
branches/release/boost/archive/detail/oserializer.hpp | 20
branches/release/boost/archive/impl/archive_pointer_iserializer.ipp | 13
branches/release/boost/archive/impl/archive_pointer_oserializer.ipp | 15
branches/release/boost/archive/impl/basic_binary_iarchive.ipp | 10
branches/release/boost/archive/impl/basic_binary_iprimitive.ipp | 23
branches/release/boost/archive/impl/basic_binary_oarchive.ipp | 4
branches/release/boost/archive/impl/basic_binary_oprimitive.ipp | 13
branches/release/boost/archive/impl/basic_text_iarchive.ipp | 10
branches/release/boost/archive/impl/basic_text_iprimitive.ipp | 39 +
branches/release/boost/archive/impl/basic_text_oarchive.ipp | 4
branches/release/boost/archive/impl/basic_text_oprimitive.ipp | 17
branches/release/boost/archive/impl/basic_xml_grammar.hpp | 14
branches/release/boost/archive/impl/basic_xml_iarchive.ipp | 8
branches/release/boost/archive/impl/basic_xml_oarchive.ipp | 28
branches/release/boost/archive/impl/xml_iarchive_impl.ipp | 14
branches/release/boost/archive/impl/xml_wiarchive_impl.ipp | 12
branches/release/boost/archive/impl/xml_woarchive_impl.ipp | 4
branches/release/boost/archive/iterators/base64_from_binary.hpp | 2
branches/release/boost/archive/iterators/binary_from_base64.hpp | 6
branches/release/boost/archive/iterators/dataflow_exception.hpp | 2
branches/release/boost/archive/iterators/insert_linebreaks.hpp | 2
branches/release/boost/archive/iterators/mb_from_wchar.hpp | 2
branches/release/boost/archive/iterators/remove_whitespace.hpp | 2
branches/release/boost/archive/iterators/transform_width.hpp | 2
branches/release/boost/archive/iterators/wchar_from_mb.hpp | 6
branches/release/boost/archive/iterators/xml_escape.hpp | 2
branches/release/boost/archive/iterators/xml_unescape.hpp | 6
branches/release/boost/archive/polymorphic_iarchive.hpp | 20
branches/release/boost/archive/polymorphic_oarchive.hpp | 20
branches/release/boost/archive/shared_ptr_helper.hpp | 4
branches/release/boost/serialization/access.hpp | 2
branches/release/boost/serialization/array.hpp | 2
branches/release/boost/serialization/assume_abstract.hpp | 8
branches/release/boost/serialization/collection_size_type.hpp | 2
branches/release/boost/serialization/collection_traits.hpp | 8
branches/release/boost/serialization/detail/shared_count_132.hpp | 12
branches/release/boost/serialization/detail/shared_ptr_132.hpp | 14
branches/release/boost/serialization/detail/shared_ptr_nmt_132.hpp | 4
branches/release/boost/serialization/export.hpp | 2
branches/release/boost/serialization/extended_type_info_typeid.hpp | 15
branches/release/boost/serialization/serialization.hpp | 6
branches/release/boost/serialization/singleton.hpp | 11
branches/release/boost/serialization/variant.hpp | 5
branches/release/boost/serialization/void_cast.hpp | 18
branches/release/libs/serialization/build/Jamfile.v2 | 9
branches/release/libs/serialization/example/demo_fast_archive.cpp | 2
branches/release/libs/serialization/example/portable_binary_archive.hpp | 2
branches/release/libs/serialization/example/portable_binary_iarchive.cpp | 14
branches/release/libs/serialization/example/portable_binary_oarchive.cpp | 6
branches/release/libs/serialization/src/basic_archive.cpp | 4
branches/release/libs/serialization/src/basic_iarchive.cpp | 20
branches/release/libs/serialization/src/basic_oarchive.cpp | 18
branches/release/libs/serialization/src/basic_xml_archive.cpp | 16
branches/release/libs/serialization/src/basic_xml_grammar.ipp | 49 +-
branches/release/libs/serialization/src/extended_type_info.cpp | 27
branches/release/libs/serialization/src/extended_type_info_typeid.cpp | 39 +-
branches/release/libs/serialization/src/void_cast.cpp | 51 +--
branches/release/libs/serialization/src/xml_wgrammar.cpp | 97 ------
branches/release/libs/serialization/src/xml_woarchive.cpp | 2
branches/release/libs/serialization/test/D.hpp | 2
branches/release/libs/serialization/test/test_binary.cpp | 36 ++
branches/release/libs/serialization/test/test_delete_pointer.cpp | 4
branches/release/libs/serialization/test/test_diamond.cpp | 2
branches/release/libs/serialization/test/test_exported.cpp | 2
branches/release/libs/serialization/test/test_iterators_base64.cpp | 2
branches/release/libs/serialization/test/test_private_ctor.cpp | 19
branches/release/libs/serialization/test/test_smart_cast.cpp | 4
branches/release/libs/serialization/test/test_static_warning.cpp | 2
branches/release/libs/serialization/test/test_tools.hpp | 15
branches/release/libs/serialization/test/test_variant.cpp | 2
branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln | 640 ++++++++++++++++++++-------------------
branches/release/libs/serialization/vc7ide/Library.vcproj | 25 +
88 files changed, 890 insertions(+), 823 deletions(-)
Modified: branches/release/boost/archive/basic_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_archive.hpp (original)
+++ branches/release/boost/archive/basic_archive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <boost/config.hpp>
-#include <boost/strong_typedef.hpp>
+#include <boost/serialization/strong_typedef.hpp>
#include <boost/noncopyable.hpp>
#include <boost/archive/detail/auto_link_archive.hpp>
@@ -93,10 +93,10 @@
#define NULL_POINTER_TAG class_id_type(-1)
BOOST_ARCHIVE_DECL(const char *)
-ARCHIVE_SIGNATURE();
+BOOST_ARCHIVE_SIGNATURE();
BOOST_ARCHIVE_DECL(unsigned char)
-ARCHIVE_VERSION();
+BOOST_ARCHIVE_VERSION();
}// namespace archive
}// namespace boost
Modified: branches/release/boost/archive/basic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iarchive.hpp (original)
+++ branches/release/boost/archive/basic_binary_iarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -25,7 +25,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/detail/common_iarchive.hpp>
#include <boost/serialization/collection_size_type.hpp>
Modified: branches/release/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_iprimitive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -45,7 +45,7 @@
#include <boost/cstdint.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
//#include <boost/limits.hpp>
//#include <boost/io/ios_state.hpp>
@@ -122,9 +122,15 @@
// we provide an optimized load for all fundamental types
// typedef serialization::is_bitwise_serializable<mpl::_1>
// use_array_optimization;
- struct use_array_optimization {
- template <class T>
- struct apply : public serialization::is_bitwise_serializable<T> {};
+ struct use_array_optimization {
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
};
// the optimized load_array dispatches to load_binary
@@ -151,18 +157,20 @@
s
);
if(scount != static_cast<std::streamsize>(s))
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
// note: an optimizer should eliminate the following for char files
s = count % sizeof(Elem);
if(0 < s){
// if(is.fail())
-// boost::throw_exception(archive_exception(archive_exception::stream_error));
+// boost::serialization::throw_exception(
+// archive_exception(archive_exception::stream_error)
+// );
Elem t;
scount = m_sb.sgetn(& t, 1);
if(scount != 1)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
std::memcpy(static_cast<char*>(address) + (count - s), &t, s);
Modified: branches/release/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oarchive.hpp (original)
+++ branches/release/boost/archive/basic_binary_oarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,7 +24,7 @@
// ON PLATFORM APART FROM THE ONE THEY ARE CREATE ON
#include <boost/config.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/archive/detail/common_oarchive.hpp>
Modified: branches/release/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_oprimitive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -41,7 +41,7 @@
//#include <boost/limits.hpp>
//#include <boost/io/ios_state.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/basic_streambuf_locale_saver.hpp>
#include <boost/archive/archive_exception.hpp>
@@ -116,11 +116,17 @@
// we provide an optimized save for all fundamental types
// typedef serialization::is_bitwise_serializable<mpl::_1>
- // use_array_optimization;
+ // use_array_optimization;
// workaround without using mpl lambdas
struct use_array_optimization {
- template <class T>
- struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ template <class T>
+ #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+ struct apply {
+ typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;
+ };
+ #else
+ struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+ #endif
};
@@ -148,7 +154,9 @@
// mode where by cr characters recieve special treatment.
// be sure that the output stream is opened with ios::binary
//if(os.fail())
- // boost::throw_exception(archive_exception(archive_exception::stream_error));
+ // boost::serialization::throw_exception(
+ // archive_exception(archive_exception::stream_error)
+ // );
// figure number of elements to output - round up
count = ( count + sizeof(Elem) - 1)
/ sizeof(Elem);
@@ -157,7 +165,9 @@
count
);
if(count != static_cast<std::size_t>(scount))
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
//os.write(
// static_cast<const BOOST_DEDUCED_TYPENAME OStream::char_type *>(address),
// count
Modified: branches/release/boost/archive/basic_text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iarchive.hpp (original)
+++ branches/release/boost/archive/basic_text_iarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -25,7 +25,7 @@
// use two template parameters
#include <boost/config.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/archive/detail/common_iarchive.hpp>
Modified: branches/release/boost/archive/basic_text_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iprimitive.hpp (original)
+++ branches/release/boost/archive/basic_text_iprimitive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -43,7 +43,7 @@
#include <boost/archive/dinkumware.hpp>
#endif
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/limits.hpp>
#include <boost/io/ios_state.hpp>
#include <boost/scoped_ptr.hpp>
@@ -80,13 +80,17 @@
void load(T & t)
{
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
is >> t;
}
void load(unsigned char & t)
{
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
unsigned short int i;
is >> i;
t = static_cast<unsigned char>(i);
@@ -94,7 +98,9 @@
void load(signed char & t)
{
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
signed short int i;
is >> i;
t = static_cast<signed char>(i);
@@ -102,7 +108,9 @@
void load(char & t)
{
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
short int i;
is >> i;
t = static_cast<char>(i);
@@ -111,7 +119,9 @@
void load(wchar_t & t)
{
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
unsigned i;
is >> i;
t = static_cast<wchar_t>(i);
Modified: branches/release/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oarchive.hpp (original)
+++ branches/release/boost/archive/basic_text_oarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -26,7 +26,7 @@
#include <cassert>
#include <boost/config.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/archive/detail/common_oarchive.hpp>
Modified: branches/release/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oprimitive.hpp (original)
+++ branches/release/boost/archive/basic_text_oprimitive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -48,7 +48,7 @@
#include <boost/limits.hpp>
#include <boost/io/ios_state.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/archive_exception.hpp>
#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -83,7 +83,9 @@
template<class T>
void save(const T &t){
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << t;
}
@@ -94,32 +96,42 @@
// otherwise crash on load.
assert(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << t;
}
void save(const signed char t)
{
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << static_cast<short int>(t);
}
void save(const unsigned char t)
{
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << static_cast<short unsigned int>(t);
}
void save(const char t)
{
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << static_cast<short int>(t);
}
#ifndef BOOST_NO_INTRINSIC_WCHAR_T
void save(const wchar_t t)
{
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << static_cast<int>(t);
}
#endif
@@ -127,7 +139,9 @@
{
// must be a user mistake - can't serialize un-initialized data
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << std::setprecision(std::numeric_limits<float>::digits10 + 2);
os << t;
}
@@ -135,7 +149,9 @@
{
// must be a user mistake - can't serialize un-initialized data
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os << std::setprecision(std::numeric_limits<double>::digits10 + 2);
os << t;
}
@@ -147,13 +163,17 @@
// unformatted append of one character
void put(int c){
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os.put(c);
}
// unformatted append of null terminated string
void put(const char * s){
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
while('\0' != *s)
os.put(*s++);
}
Modified: branches/release/boost/archive/basic_xml_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_xml_archive.hpp (original)
+++ branches/release/boost/archive/basic_xml_archive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -28,35 +28,35 @@
extern
BOOST_ARCHIVE_DECL(const char *)
-OBJECT_ID();
+BOOST_ARCHIVE_XML_OBJECT_ID();
extern
BOOST_ARCHIVE_DECL(const char *)
-OBJECT_REFERENCE();
+BOOST_ARCHIVE_XML_OBJECT_REFERENCE();
extern
BOOST_ARCHIVE_DECL(const char *)
-CLASS_ID();
+BOOST_ARCHIVE_XML_CLASS_ID();
extern
BOOST_ARCHIVE_DECL(const char *)
-CLASS_ID_REFERENCE();
+BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE();
extern
BOOST_ARCHIVE_DECL(const char *)
-CLASS_NAME();
+BOOST_ARCHIVE_XML_CLASS_NAME();
extern
BOOST_ARCHIVE_DECL(const char *)
-TRACKING();
+BOOST_ARCHIVE_XML_TRACKING();
extern
BOOST_ARCHIVE_DECL(const char *)
-VERSION();
+BOOST_ARCHIVE_XML_VERSION();
extern
BOOST_ARCHIVE_DECL(const char *)
-SIGNATURE();
+BOOST_ARCHIVE_XML_SIGNATURE();
}// namespace archive
}// namespace boost
Modified: branches/release/boost/archive/basic_xml_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_xml_iarchive.hpp (original)
+++ branches/release/boost/archive/basic_xml_iarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <boost/config.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/archive/detail/common_iarchive.hpp>
Modified: branches/release/boost/archive/binary_iarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_iarchive_impl.hpp (original)
+++ branches/release/boost/archive/binary_iarchive_impl.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <istream>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_binary_iprimitive.hpp>
#include <boost/archive/basic_binary_iarchive.hpp>
Modified: branches/release/boost/archive/binary_oarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_oarchive_impl.hpp (original)
+++ branches/release/boost/archive/binary_oarchive_impl.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <ostream>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_binary_oprimitive.hpp>
#include <boost/archive/basic_binary_oarchive.hpp>
Modified: branches/release/boost/archive/detail/abi_suffix.hpp
==============================================================================
--- branches/release/boost/archive/detail/abi_suffix.hpp (original)
+++ branches/release/boost/archive/detail/abi_suffix.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -8,12 +8,12 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#if defined( __BORLANDC__ )
-#pragma nopushoptwarn
-#endif
-
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
#include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+
Modified: branches/release/boost/archive/detail/common_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/common_iarchive.hpp (original)
+++ branches/release/boost/archive/detail/common_iarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -20,7 +20,7 @@
#include <boost/archive/detail/interface_iarchive.hpp>
#include <boost/archive/detail/iserializer.hpp>
#include <boost/archive/detail/register_archive.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
namespace boost {
namespace archive {
Modified: branches/release/boost/archive/detail/iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/iserializer.hpp (original)
+++ branches/release/boost/archive/detail/iserializer.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -33,10 +33,10 @@
using ::size_t;
} // namespace std
#endif
-#include <boost/throw_exception.hpp>
-#include <boost/smart_cast.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/smart_cast.hpp>
#include <boost/static_assert.hpp>
-#include <boost/static_warning.hpp>
+#include <boost/serialization/static_warning.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <boost/type_traits/is_pointer.hpp>
@@ -150,7 +150,7 @@
// make sure call is routed through the higest interface that might
// be specialized by the user.
boost::serialization::serialize_adl(
- boost::smart_cast_reference<Archive &>(ar),
+ boost::serialization::smart_cast_reference<Archive &>(ar),
* static_cast<T *>(x),
file_version
);
@@ -252,11 +252,12 @@
const unsigned int file_version
) const
{
- Archive & ar_impl = boost::smart_cast_reference<Archive &>(ar);
+ Archive & ar_impl =
+ boost::serialization::smart_cast_reference<Archive &>(ar);
auto_ptr_with_deleter<T> ap(heap_allocator<T>::invoke());
if(NULL == ap.get())
- boost::throw_exception(std::bad_alloc()) ;
+ boost::serialization::throw_exception(std::bad_alloc()) ;
T * t = ap.get();
x = t;
@@ -480,7 +481,7 @@
int count;
ar >> BOOST_SERIALIZATION_NVP(count);
if(count > current_count)
- boost::throw_exception(archive::archive_exception(
+ boost::serialization::throw_exception(archive::archive_exception(
boost::archive::archive_exception::array_size_too_short
));
ar >> serialization::make_array(static_cast<value_type*>(&t[0]),count);
Modified: branches/release/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/oserializer.hpp (original)
+++ branches/release/boost/archive/detail/oserializer.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -27,10 +27,10 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/smart_cast.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/smart_cast.hpp>
#include <boost/static_assert.hpp>
-#include <boost/static_warning.hpp>
+#include <boost/serialization/static_warning.hpp>
#include <boost/type_traits/is_pointer.hpp>
#include <boost/type_traits/is_enum.hpp>
@@ -142,7 +142,7 @@
// be specialized by the user.
BOOST_STATIC_ASSERT(boost::is_const<T>::value == false);
boost::serialization::serialize_adl(
- boost::smart_cast_reference<Archive &>(ar),
+ boost::serialization::smart_cast_reference<Archive &>(ar),
* static_cast<T *>(const_cast<void *>(x)),
version()
);
@@ -180,7 +180,8 @@
// be specialized by the user.
T * t = static_cast<T *>(const_cast<void *>(x));
const unsigned int file_version = boost::serialization::version<T>::value;
- Archive & ar_impl = boost::smart_cast_reference<Archive &>(ar);
+ Archive & ar_impl
+ = boost::serialization::smart_cast_reference<Archive &>(ar);
boost::serialization::save_construct_data_adl<Archive, T>(
ar_impl,
t,
@@ -369,7 +370,7 @@
// note:if this exception is thrown, be sure that derived pointer
// is either registered or exported.
if(NULL == true_type){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unregistered_class)
);
}
@@ -389,7 +390,7 @@
static_cast<const void *>(&t)
);
if(NULL == vp){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unregistered_cast)
);
}
@@ -401,7 +402,7 @@
= archive_pointer_oserializer<Archive>::find(* true_type);
assert(NULL != bpos);
if(NULL == bpos)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unregistered_class)
);
ar.save_pointer(vp, bpos);
@@ -447,7 +448,8 @@
#endif
register_type(ar, * t);
if(NULL == t){
- basic_oarchive & boa = boost::smart_cast_reference<basic_oarchive &>(ar);
+ basic_oarchive & boa
+ = boost::serialization::smart_cast_reference<basic_oarchive &>(ar);
boa.save_null_pointer();
save_access::end_preamble(ar);
return;
Modified: branches/release/boost/archive/impl/archive_pointer_iserializer.ipp
==============================================================================
--- branches/release/boost/archive/impl/archive_pointer_iserializer.ipp (original)
+++ branches/release/boost/archive/impl/archive_pointer_iserializer.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -70,11 +70,16 @@
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
archive_pointer_iserializer<Archive>::~archive_pointer_iserializer(){
- std::size_t count;
- count = serialization::singleton<
+ if(! serialization::singleton<
iserializer_map<Archive>
- >::get_mutable_instance().erase(this);
- assert(count);
+ >::is_destroyed()
+ ){
+ std::size_t count;
+ count = serialization::singleton<
+ iserializer_map<Archive>
+ >::get_mutable_instance().erase(this);
+ assert(count);
+ }
}
} // namespace detail
Modified: branches/release/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- branches/release/boost/archive/impl/archive_pointer_oserializer.ipp (original)
+++ branches/release/boost/archive/impl/archive_pointer_oserializer.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -70,11 +70,16 @@
archive_pointer_oserializer<Archive>::~archive_pointer_oserializer(){
// note: we need to check that the map still exists as we can't depend
// on static variables being constructed in a specific sequence
- unsigned int count;
- count = serialization::singleton<
- oserializer_map<Archive>
- >::get_mutable_instance().erase(this);
- assert(count);
+ if(! serialization::singleton<
+ oserializer_map<Archive>
+ >::is_destroyed()
+ ){
+ unsigned int count;
+ count = serialization::singleton<
+ oserializer_map<Archive>
+ >::get_mutable_instance().erase(this);
+ assert(count);
+ }
}
} // namespace detail
Modified: branches/release/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_iarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -35,7 +35,7 @@
cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
load_override(cn, 0);
if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
);
std::memcpy(t, cn.data(), cn.size());
@@ -49,8 +49,8 @@
// read signature in an archive version independent manner
std::string file_signature;
* this->This() >> file_signature;
- if(file_signature != ARCHIVE_SIGNATURE())
- boost::throw_exception(
+ if(file_signature != BOOST_ARCHIVE_SIGNATURE())
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_signature)
);
@@ -69,8 +69,8 @@
#endif
// extra little .t is to get around borland quirk
- if(ARCHIVE_VERSION() < input_library_version.t)
- boost::throw_exception(
+ if(BOOST_ARCHIVE_VERSION() < input_library_version.t)
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unsupported_version)
);
}
Modified: branches/release/boost/archive/impl/basic_binary_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_iprimitive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -22,7 +22,7 @@
#include <boost/detail/workaround.hpp> // fixup for RogueWave
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/archive/archive_exception.hpp>
@@ -45,22 +45,22 @@
unsigned char size;
this->This()->load(size);
if(sizeof(int) != size)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::incompatible_native_format)
);
this->This()->load(size);
if(sizeof(long) != size)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::incompatible_native_format)
);
this->This()->load(size);
if(sizeof(float) != size)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::incompatible_native_format)
);
this->This()->load(size);
if(sizeof(double) != size)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::incompatible_native_format)
);
@@ -68,7 +68,7 @@
int i;
this->This()->load(i);
if(1 != i)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::incompatible_native_format)
);
}
@@ -185,11 +185,12 @@
int result = static_cast<detail::input_streambuf_access<Elem, Tr> &>(
m_sb
).sync();
- if(0 != result){
- boost::throw_exception(
- archive_exception(archive_exception::stream_error)
- );
- }
+ //destructor can't throw !
+ //if(0 != result){
+ // boost::serialization::throw_exception(
+ // archive_exception(archive_exception::stream_error)
+ // );
+ //}
}
} // namespace archive
Modified: branches/release/boost/archive/impl/basic_binary_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_oarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_oarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -35,10 +35,10 @@
#endif
basic_binary_oarchive<Archive>::init(){
// write signature in an archive version independent manner
- const std::string file_signature(ARCHIVE_SIGNATURE());
+ const std::string file_signature(BOOST_ARCHIVE_SIGNATURE());
* this->This() << file_signature;
// write library version
- const version_type v(ARCHIVE_VERSION());
+ const version_type v(BOOST_ARCHIVE_VERSION());
* this->This() << v;
}
Modified: branches/release/boost/archive/impl/basic_binary_oprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_oprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_oprimitive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -30,7 +30,7 @@
#include <boost/detail/workaround.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/archive/archive_exception.hpp>
#include <boost/archive/add_facet.hpp>
@@ -155,11 +155,12 @@
int result = static_cast<detail::output_streambuf_access<Elem, Tr> &>(
m_sb
).sync();
- if(0 != result){
- boost::throw_exception(
- archive_exception(archive_exception::stream_error)
- );
- }
+ //destructor can't throw
+ //if(0 != result){
+ // boost::serialization::throw_exception(
+ // archive_exception(archive_exception::stream_error)
+ // );
+ //}
}
} // namespace archive
Modified: branches/release/boost/archive/impl/basic_text_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_iarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_iarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -35,7 +35,7 @@
cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
load_override(cn, 0);
if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
);
std::memcpy(t, cn.data(), cn.size());
@@ -49,8 +49,8 @@
// read signature in an archive version independent manner
std::string file_signature;
* this->This() >> file_signature;
- if(file_signature != ARCHIVE_SIGNATURE())
- boost::throw_exception(
+ if(file_signature != BOOST_ARCHIVE_SIGNATURE())
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_signature)
);
@@ -69,8 +69,8 @@
#endif
// extra little .t is to get around borland quirk
- if(ARCHIVE_VERSION() < input_library_version.t)
- boost::throw_exception(
+ if(BOOST_ARCHIVE_VERSION() < input_library_version.t)
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unsupported_version)
);
}
Modified: branches/release/boost/archive/impl/basic_text_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_iprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_iprimitive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -18,8 +18,8 @@
} // namespace std
#endif
-#include <boost/throw_exception.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_text_iprimitive.hpp>
#include <boost/archive/codecvt_null.hpp>
@@ -33,6 +33,23 @@
namespace boost {
namespace archive {
+namespace {
+ template<class CharType>
+ bool is_whitespace(CharType c);
+
+ template<>
+ bool is_whitespace(char t){
+ return std::isspace(t);
+ }
+
+ #ifndef BOOST_NO_CWCHAR
+ template<>
+ bool is_whitespace(wchar_t t){
+ return std::iswspace(t);
+ }
+ #endif
+}
+
// translate base64 text into binary and copy into buffer
// until buffer is full.
template<class IStream>
@@ -52,7 +69,9 @@
);
if(is.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
// convert from base64 to binary
typedef BOOST_DEDUCED_TYPENAME
iterators::transform_width<
@@ -75,7 +94,6 @@
);
char * caddr = static_cast<char *>(address);
- std::size_t padding = 2 - count % 3;
// take care that we don't increment anymore than necessary
while(--count > 0){
@@ -84,10 +102,15 @@
}
*caddr++ = static_cast<char>(*ti_begin);
- if(padding > 1)
- ++ti_begin;
- if(padding > 2)
- ++ti_begin;
+ iterators::istream_iterator<CharType> i;
+ for(;;){
+ CharType c;
+ c = is.get();
+ if(is.eof())
+ break;
+ if(is_whitespace(c))
+ break;
+ }
}
template<class IStream>
Modified: branches/release/boost/archive/impl/basic_text_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_oarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_oarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -51,10 +51,10 @@
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
basic_text_oarchive<Archive>::init(){
// write signature in an archive version independent manner
- const std::string file_signature(ARCHIVE_SIGNATURE());
+ const std::string file_signature(BOOST_ARCHIVE_SIGNATURE());
* this->This() << file_signature;
// write library version
- const version_type v(ARCHIVE_VERSION());
+ const version_type v(BOOST_ARCHIVE_VERSION());
* this->This() << v;
}
Modified: branches/release/boost/archive/impl/basic_text_oprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_oprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_oprimitive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -9,7 +9,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // NULL
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_text_oprimitive.hpp>
#include <boost/archive/codecvt_null.hpp>
@@ -36,7 +36,9 @@
return;
if(os.fail())
- boost::throw_exception(archive_exception(archive_exception::stream_error));
+ boost::serialization::throw_exception(
+ archive_exception(archive_exception::stream_error)
+ );
os.put('\n');
@@ -62,12 +64,13 @@
),
oi
);
- std::size_t padding = 2 - count % 3;
- if(padding > 1)
- *oi = '=';
- if(padding > 2)
+
+ std::size_t tail = count % 3;
+ if(tail > 0){
+ *oi++ = '=';
+ if(tail < 2)
*oi = '=';
-
+ }
}
template<class OStream>
Modified: branches/release/boost/archive/impl/basic_xml_grammar.hpp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_grammar.hpp (original)
+++ branches/release/boost/archive/impl/basic_xml_grammar.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -56,9 +56,7 @@
#endif
//#define BOOST_SPIRIT_DEBUG
-//#include <boost/spirit/core.hpp>
#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/core/non_terminal/grammar.hpp>
// the following hack is to evade a bogus error generated by using the
// word "arg" when bind.hpp has been included
@@ -83,8 +81,7 @@
// XML grammar parsing
template<class CharType>
-class basic_xml_grammar : public boost::spirit::grammar<basic_xml_grammar<CharType> >
-{
+class basic_xml_grammar {
public:
// The following is not necessary according to DR45, but at least
// one compiler (Compaq C++ 6.5 in strict_ansi mode) chokes otherwise.
@@ -161,7 +158,7 @@
IStream & is,
const rule_t &rule_,
const CharType delimiter = L'>'
- );
+ ) const ;
public:
struct return_values {
StringType object_name;
@@ -176,15 +173,14 @@
tracking_level(false)
{}
} rv;
- bool parse_start_tag(IStream & is) ;
- bool parse_end_tag(IStream & is);
- bool parse_string(IStream & is, StringType & s);
+ bool parse_start_tag(IStream & is) /*const*/;
+ bool parse_end_tag(IStream & is) const;
+ bool parse_string(IStream & is, StringType & s) /*const*/;
void init(IStream & is);
void windup(IStream & is);
basic_xml_grammar();
};
-
} // namespace archive
} // namespace boost
Modified: branches/release/boost/archive/impl/basic_xml_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_iarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_xml_iarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -12,7 +12,7 @@
#include <cstddef> // NULL
#include <algorithm>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/basic_xml_iarchive.hpp>
#include <boost/serialization/tracking.hpp>
@@ -31,7 +31,7 @@
return;
bool result = this->This()->gimpl->parse_start_tag(this->This()->get_is());
if(true != result){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -48,7 +48,7 @@
return;
bool result = this->This()->gimpl->parse_end_tag(this->This()->get_is());
if(true != result){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -66,7 +66,7 @@
name
)
){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
Modified: branches/release/boost/archive/impl/basic_xml_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_oarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_xml_oarchive.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -44,7 +44,7 @@
if((unsigned)t > 127)
return;
if(0 == lookup_table[(unsigned)t])
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(
xml_archive_exception::xml_archive_tag_name_error
)
@@ -152,7 +152,7 @@
basic_xml_oarchive<Archive>::save_override(const object_id_type & t, int)
{
int i = t.t; // extra .t is for borland
- write_attribute(OBJECT_ID(), i, "=\"_");
+ write_attribute(BOOST_ARCHIVE_XML_OBJECT_ID(), i, "=\"_");
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -161,14 +161,14 @@
int
){
int i = t.t; // extra .t is for borland
- write_attribute(OBJECT_REFERENCE(), i, "=\"_");
+ write_attribute(BOOST_ARCHIVE_XML_OBJECT_REFERENCE(), i, "=\"_");
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
basic_xml_oarchive<Archive>::save_override(const version_type & t, int)
{
int i = t.t; // extra .t is for borland
- write_attribute(VERSION(), i);
+ write_attribute(VBOOST_ARCHIVE_XML_ERSION(), i);
}
#endif
@@ -178,7 +178,7 @@
{
// borland doesn't do conversion of STRONG_TYPEDEFs very well
const unsigned int i = t;
- write_attribute(OBJECT_ID(), i, "=\"_");
+ write_attribute(BOOST_ARCHIVE_XML_OBJECT_ID(), i, "=\"_");
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -187,21 +187,21 @@
int
){
const unsigned int i = t;
- write_attribute(OBJECT_REFERENCE(), i, "=\"_");
+ write_attribute(BOOST_ARCHIVE_XML_OBJECT_REFERENCE(), i, "=\"_");
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
basic_xml_oarchive<Archive>::save_override(const version_type & t, int)
{
const unsigned int i = t;
- write_attribute(VERSION(), i);
+ write_attribute(BOOST_ARCHIVE_XML_VERSION(), i);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
basic_xml_oarchive<Archive>::save_override(const class_id_type & t, int)
{
- write_attribute(CLASS_ID(), t);
+ write_attribute(BOOST_ARCHIVE_XML_CLASS_ID(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -209,7 +209,7 @@
const class_id_reference_type & t,
int
){
- write_attribute(CLASS_ID_REFERENCE(), t);
+ write_attribute(BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -217,7 +217,7 @@
const class_id_optional_type & t,
int
){
- write_attribute(CLASS_ID(), t);
+ write_attribute(BOOST_ARCHIVE_XML_CLASS_ID(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -226,14 +226,14 @@
const char * key = t;
if(NULL == key)
return;
- write_attribute(CLASS_NAME(), key);
+ write_attribute(BOOST_ARCHIVE_XML_CLASS_NAME(), key);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
basic_xml_oarchive<Archive>::save_override(const tracking_type & t, int)
{
- write_attribute(TRACKING(), t.t);
+ write_attribute(BOOST_ARCHIVE_XML_TRACKING(), t.t);
}
template<class Archive>
@@ -244,8 +244,8 @@
this->This()->put("<!DOCTYPE boost_serialization>\n");
// xml document wrapper - outer root
this->This()->put("<boost_serialization");
- write_attribute("signature", ARCHIVE_SIGNATURE());
- write_attribute("version", ARCHIVE_VERSION());
+ write_attribute("signature", BOOST_ARCHIVE_SIGNATURE());
+ write_attribute("version", BOOST_ARCHIVE_VERSION());
this->This()->put(">\n");
}
Modified: branches/release/boost/archive/impl/xml_iarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_iarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_iarchive_impl.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -56,7 +56,7 @@
std::string s;
bool result = gimpl->parse_string(is, s);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
@@ -74,7 +74,7 @@
ws += wc;
continue;
}
- boost::throw_exception(
+ boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
@@ -90,7 +90,7 @@
std::string s;
bool result = gimpl->parse_string(is, s);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
@@ -104,7 +104,7 @@
*ws++ = wc;
continue;
}
- boost::throw_exception(
+ boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
@@ -121,7 +121,7 @@
xml_iarchive_impl<Archive>::load(std::string &s){
bool result = gimpl->parse_string(is, s);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
}
@@ -132,7 +132,7 @@
std::string tstring;
bool result = gimpl->parse_string(is, tstring);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
std::memcpy(s, tstring.data(), tstring.size());
@@ -144,7 +144,7 @@
xml_iarchive_impl<Archive>::load_override(class_name_type & t, int){
const std::string & s = gimpl->rv.class_name;
if(s.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
);
char * tptr = t;
Modified: branches/release/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_wiarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_wiarchive_impl.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -30,7 +30,7 @@
#include <boost/io/ios_state.hpp>
#include <boost/detail/no_exceptions_support.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/serialization/string.hpp>
#include <boost/archive/add_facet.hpp>
@@ -73,7 +73,7 @@
std::wstring ws;
bool result = gimpl->parse_string(is, ws);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
#if BOOST_WORKAROUND(_RWSTD_VER, BOOST_TESTED_AT(20101))
@@ -98,7 +98,7 @@
xml_wiarchive_impl<Archive>::load(std::wstring & ws){
bool result = gimpl->parse_string(is, ws);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
}
@@ -110,7 +110,7 @@
std::wstring ws;
bool result = gimpl->parse_string(is, ws);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
copy_to_ptr(s, ws);
@@ -123,7 +123,7 @@
std::wstring twstring;
bool result = gimpl->parse_string(is, twstring);
if(! result)
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
std::memcpy(ws, twstring.c_str(), twstring.size());
@@ -136,7 +136,7 @@
xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){
const std::wstring & ws = gimpl->rv.class_name;
if(ws.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
);
copy_to_ptr(t, ws);
Modified: branches/release/boost/archive/impl/xml_woarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_woarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_woarchive_impl.ipp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -30,8 +30,8 @@
} // namespace std
#endif
-#include <boost/throw_exception.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/iterators/xml_escape.hpp>
#include <boost/archive/iterators/wchar_from_mb.hpp>
Modified: branches/release/boost/archive/iterators/base64_from_binary.hpp
==============================================================================
--- branches/release/boost/archive/iterators/base64_from_binary.hpp (original)
+++ branches/release/boost/archive/iterators/base64_from_binary.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,7 +19,7 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
Modified: branches/release/boost/archive/iterators/binary_from_base64.hpp
==============================================================================
--- branches/release/boost/archive/iterators/binary_from_base64.hpp (original)
+++ branches/release/boost/archive/iterators/binary_from_base64.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,8 +19,8 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/throw_exception.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/static_assert.hpp>
#include <boost/iterator/transform_iterator.hpp>
@@ -57,7 +57,7 @@
if((unsigned)t <= 127)
value = lookup_table[(unsigned)t];
if(-1 == value)
- boost::throw_exception(
+ boost::serialization::throw_exception(
dataflow_exception(dataflow_exception::invalid_base64_character)
);
return value;
Modified: branches/release/boost/archive/iterators/dataflow_exception.hpp
==============================================================================
--- branches/release/boost/archive/iterators/dataflow_exception.hpp (original)
+++ branches/release/boost/archive/iterators/dataflow_exception.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,6 +19,7 @@
#include <boost/config.hpp>
#ifndef BOOST_NO_EXCEPTIONS
#include <exception>
+#endif //BOOST_NO_EXCEPTIONS
#include <cassert>
@@ -76,5 +77,4 @@
} // namespace archive
} // namespace boost
-#endif //BOOST_NO_EXCEPTIONS
#endif //BOOST_ARCHIVE_ITERATORS_DATAFLOW_EXCEPTION_HPP
Modified: branches/release/boost/archive/iterators/insert_linebreaks.hpp
==============================================================================
--- branches/release/boost/archive/iterators/insert_linebreaks.hpp (original)
+++ branches/release/boost/archive/iterators/insert_linebreaks.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -23,7 +23,7 @@
namespace std{ using ::memcpy; }
#endif
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_traits.hpp>
Modified: branches/release/boost/archive/iterators/mb_from_wchar.hpp
==============================================================================
--- branches/release/boost/archive/iterators/mb_from_wchar.hpp (original)
+++ branches/release/boost/archive/iterators/mb_from_wchar.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -28,7 +28,7 @@
} // namespace std
#endif
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
namespace boost {
Modified: branches/release/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- branches/release/boost/archive/iterators/remove_whitespace.hpp (original)
+++ branches/release/boost/archive/iterators/remove_whitespace.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -20,7 +20,7 @@
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/filter_iterator.hpp>
Modified: branches/release/boost/archive/iterators/transform_width.hpp
==============================================================================
--- branches/release/boost/archive/iterators/transform_width.hpp (original)
+++ branches/release/boost/archive/iterators/transform_width.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -25,7 +25,7 @@
// or 3 8 bit characters
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME & PTFO
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_traits.hpp>
Modified: branches/release/boost/archive/iterators/wchar_from_mb.hpp
==============================================================================
--- branches/release/boost/archive/iterators/wchar_from_mb.hpp (original)
+++ branches/release/boost/archive/iterators/wchar_from_mb.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -29,8 +29,8 @@
} // namespace std
#endif
-#include <boost/throw_exception.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
@@ -116,7 +116,7 @@
wchar_t retval;
int result = std::mbtowc(& retval, buffer, MB_CUR_MAX);
if(0 >= result)
- boost::throw_exception(iterators::dataflow_exception(
+ boost::serialization::throw_exception(iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
));
return retval;
Modified: branches/release/boost/archive/iterators/xml_escape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_escape.hpp (original)
+++ branches/release/boost/archive/iterators/xml_escape.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,7 +19,7 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/iterators/escape.hpp>
Modified: branches/release/boost/archive/iterators/xml_unescape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_unescape.hpp (original)
+++ branches/release/boost/archive/iterators/xml_unescape.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,8 +19,8 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/throw_exception.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/iterators/unescape.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
@@ -61,7 +61,7 @@
void xml_unescape<Base>::drain_residue(const char * literal){
do{
if(* literal != * ++(this->base_reference()))
- boost::throw_exception(
+ boost::serialization::throw_exception(
dataflow_exception(
dataflow_exception::invalid_xml_escape_sequence
)
Modified: branches/release/boost/archive/polymorphic_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_iarchive.hpp (original)
+++ branches/release/boost/archive/polymorphic_iarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -29,7 +29,7 @@
#include <string>
#include <boost/cstdint.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/detail/iserializer.hpp>
#include <boost/archive/detail/interface_iarchive.hpp>
#include <boost/serialization/nvp.hpp>
@@ -42,13 +42,17 @@
#if defined(BOOST_NO_INT64_T)
#define BOOST_NO_INTRINSIC_INT64_T
#else
- #if defined(ULONG_MAX)
- #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #define BOOST_NO_INTRINSIC_INT64_T
- #endif
- #else
- #define BOOST_NO_INTRINSIC_INT64_T
- #endif
+ #if defined(ULLONG_MAX)
+ #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #elif defined(ULONG_MAX)
+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #else
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
#endif
namespace boost {
Modified: branches/release/boost/archive/polymorphic_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_oarchive.hpp (original)
+++ branches/release/boost/archive/polymorphic_oarchive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -28,7 +28,7 @@
#endif
#include <boost/cstdint.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/detail/oserializer.hpp>
#include <boost/archive/detail/interface_oarchive.hpp>
#include <boost/serialization/nvp.hpp>
@@ -41,13 +41,17 @@
#if defined(BOOST_NO_INT64_T)
#define BOOST_NO_INTRINSIC_INT64_T
#else
- #if defined(ULONG_MAX)
- #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #define BOOST_NO_INTRINSIC_INT64_T
- #endif
- #else
- #define BOOST_NO_INTRINSIC_INT64_T
- #endif
+ #if defined(ULLONG_MAX)
+ #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #elif defined(ULONG_MAX)
+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #else
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
#endif
namespace boost {
Modified: branches/release/boost/archive/shared_ptr_helper.hpp
==============================================================================
--- branches/release/boost/archive/shared_ptr_helper.hpp (original)
+++ branches/release/boost/archive/shared_ptr_helper.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,7 +24,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/serialization/type_info_implementation.hpp>
#include <boost/serialization/shared_ptr_132.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/archive_exception.hpp>
@@ -93,7 +93,7 @@
// note:if this exception is thrown, be sure that derived pointer
// is either registered or exported.
if(NULL == true_type)
- boost::throw_exception(
+ boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::unregistered_class
)
Modified: branches/release/boost/serialization/access.hpp
==============================================================================
--- branches/release/boost/serialization/access.hpp (original)
+++ branches/release/boost/serialization/access.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -18,7 +18,7 @@
#include <boost/config.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
namespace boost {
Modified: branches/release/boost/serialization/array.hpp
==============================================================================
--- branches/release/boost/serialization/array.hpp (original)
+++ branches/release/boost/serialization/array.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -124,7 +124,7 @@
template <class Archive, class T, std::size_t N>
-void serialize(Archive& ar, boost::array<T,N>& a, const unsigned int version)
+void serialize(Archive& ar, boost::array<T,N>& a, const unsigned int /* version */)
{
ar & make_nvp("elems",a.elems);
}
Modified: branches/release/boost/serialization/assume_abstract.hpp
==============================================================================
--- branches/release/boost/serialization/assume_abstract.hpp (original)
+++ branches/release/boost/serialization/assume_abstract.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -1,5 +1,5 @@
-#ifndef BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
-#define BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
+#ifndef BOOST_SERIALIZATION_ASSUME_ABSTRACT_HPP
+#define BOOST_SERIALIZATION_ASSUME_ABSTRACT_HPP
// MS compatible compilers support #pragma once
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -7,7 +7,7 @@
#endif
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// is_abstract_class.hpp:
+// assume_abstract_class.hpp:
// (C) Copyright 2008 Robert Ramey
// Use, modification and distribution is subject to the Boost Software
@@ -56,4 +56,4 @@
#endif // BOOST_NO_IS_ABSTRACT
-#endif //BOOST_SERIALIZATION_IS_ABSTRACT_CLASS_HPP
+#endif //BOOST_SERIALIZATION_ASSUME_ABSTRACT_HPP
Modified: branches/release/boost/serialization/collection_size_type.hpp
==============================================================================
--- branches/release/boost/serialization/collection_size_type.hpp (original)
+++ branches/release/boost/serialization/collection_size_type.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -6,7 +6,7 @@
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/strong_typedef.hpp>
+#include <boost/serialization/strong_typedef.hpp>
#include <boost/serialization/level.hpp>
namespace boost { namespace serialization {
Modified: branches/release/boost/serialization/collection_traits.hpp
==============================================================================
--- branches/release/boost/serialization/collection_traits.hpp (original)
+++ branches/release/boost/serialization/collection_traits.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -54,8 +54,12 @@
#if defined(BOOST_NO_INT64_T)
#define BOOST_NO_INTRINSIC_INT64_T
#else
- #if defined(ULONG_MAX)
- #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+ #if defined(ULLONG_MAX)
+ #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
+ #define BOOST_NO_INTRINSIC_INT64_T
+ #endif
+ #elif defined(ULONG_MAX)
+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
#define BOOST_NO_INTRINSIC_INT64_T
#endif
#else
Modified: branches/release/boost/serialization/detail/shared_count_132.hpp
==============================================================================
--- branches/release/boost/serialization/detail/shared_count_132.hpp (original)
+++ branches/release/boost/serialization/detail/shared_count_132.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,7 +24,7 @@
#endif
#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/detail/lightweight_mutex.hpp>
#if defined(BOOST_SP_USE_QUICK_ALLOCATOR)
@@ -134,7 +134,7 @@
#if defined(BOOST_HAS_THREADS)
mutex_type::scoped_lock lock(mtx_);
#endif
- if(use_count_ == 0) boost::throw_exception(bad_weak_ptr());
+ if(use_count_ == 0) boost::serialization::throw_exception(bad_weak_ptr());
++use_count_;
}
@@ -292,12 +292,12 @@
void * operator new(std::size_t)
{
- return quick_allocator<this_type>::alloc();
+ return boost::detail::quick_allocator<this_type>::alloc();
}
void operator delete(void * p)
{
- quick_allocator<this_type>::dealloc(p);
+ boost::detail::quick_allocator<this_type>::dealloc(p);
}
#endif
@@ -357,7 +357,7 @@
if(pi_ == 0)
{
d(p); // delete p
- boost::throw_exception(std::bad_alloc());
+ boost::serialization::throw_exception(std::bad_alloc());
}
#endif
@@ -551,7 +551,7 @@
}
else
{
- boost::throw_exception(bad_weak_ptr());
+ boost::serialization::throw_exception(bad_weak_ptr());
}
}
Modified: branches/release/boost/serialization/detail/shared_ptr_132.hpp
==============================================================================
--- branches/release/boost/serialization/detail/shared_ptr_132.hpp (original)
+++ branches/release/boost/serialization/detail/shared_ptr_132.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,12 +17,12 @@
#include <boost/config.hpp> // for broken compiler workarounds
#if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
-#include <boost/serializaition/detail/shared_ptr_nmt_132.hpp>
+#include <boost/serialization/detail/shared_ptr_nmt_132.hpp>
#else
#include <boost/assert.hpp>
#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/serialization/access.hpp>
@@ -41,10 +41,6 @@
namespace boost_132 {
-#if !BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x560) )
-using namespace boost;
-#endif
-
template<class T> class weak_ptr;
template<class T> class enable_shared_from_this;
@@ -126,10 +122,10 @@
#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) )
template<class Y>
- explicit shared_ptr(Y * p): px(p), pn(p,boost::checked_deleter<Y>()) // Y must be complete
+ explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete
#else
template<class Y>
- explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete
+ explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete
#endif
{
detail::sp_enable_shared_from_this( pn, p, p );
@@ -196,7 +192,7 @@
{
if(px == 0)
{
- boost::throw_exception(std::bad_cast());
+ boost::serialization::throw_exception(std::bad_cast());
}
}
Modified: branches/release/boost/serialization/detail/shared_ptr_nmt_132.hpp
==============================================================================
--- branches/release/boost/serialization/detail/shared_ptr_nmt_132.hpp (original)
+++ branches/release/boost/serialization/detail/shared_ptr_nmt_132.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -16,7 +16,7 @@
#include <boost/assert.hpp>
#include <boost/checked_delete.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/detail/atomic_count.hpp>
#ifndef BOOST_NO_AUTO_PTR
@@ -62,7 +62,7 @@
if(pn == 0)
{
boost::checked_delete(p);
- boost::throw_exception(std::bad_alloc());
+ boost::serialization::throw_exception(std::bad_alloc());
}
#endif
Modified: branches/release/boost/serialization/export.hpp
==============================================================================
--- branches/release/boost/serialization/export.hpp (original)
+++ branches/release/boost/serialization/export.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -26,13 +26,13 @@
#include <boost/config.hpp>
#include <boost/static_assert.hpp>
-#include <boost/static_warning.hpp>
#include <boost/preprocessor/stringize.hpp>
#include <boost/type_traits/is_polymorphic.hpp>
#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO
#include <boost/serialization/extended_type_info_typeid.hpp>
#endif
+#include <boost/serialization/static_warning.hpp>
#include <boost/serialization/type_info_implementation.hpp>
#include <boost/serialization/assume_abstract.hpp>
#include <boost/serialization/force_include.hpp>
Modified: branches/release/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- branches/release/boost/serialization/extended_type_info_typeid.hpp (original)
+++ branches/release/boost/serialization/extended_type_info_typeid.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -20,11 +20,11 @@
#include <typeinfo>
#include <cstdarg>
-
+#include <cassert>
#include <boost/config.hpp>
#include <boost/static_assert.hpp>
-#include <boost/static_warning.hpp>
+#include <boost/serialization/static_warning.hpp>
#include <boost/type_traits/is_polymorphic.hpp>
#include <boost/type_traits/remove_const.hpp>
@@ -112,8 +112,15 @@
return NULL;
}
}
- void destroy(void const * const p) const{
- delete static_cast<T const *>(p) ;
+ void destroy(void const * const p) const {
+ // the only current usage of extended type info is in the
+ // serialization library. The statement below requires
+ // that destructor of type T be public and this creates
+ // a problem for some users. So, for now, comment this
+ // out
+ //delete static_cast<T const *>(p);
+ // and trap any attempt to invoke this function
+ assert(false);
}
};
Modified: branches/release/boost/serialization/serialization.hpp
==============================================================================
--- branches/release/boost/serialization/serialization.hpp (original)
+++ branches/release/boost/serialization/serialization.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -11,9 +11,9 @@
#endif
#include <boost/config.hpp>
-#include <boost/strong_typedef.hpp>
-#include <boost/pfto.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/strong_typedef.hpp>
+#include <boost/serialization/pfto.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/nvp.hpp>
// incremented for each "release"
Modified: branches/release/boost/serialization/singleton.hpp
==============================================================================
--- branches/release/boost/serialization/singleton.hpp (original)
+++ branches/release/boost/serialization/singleton.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -97,6 +97,7 @@
class singleton : public singleton_module
{
private:
+ static bool m_is_destroyed;
BOOST_DLLEXPORT static T & instance;
// include this to provoke instantiation at pre-execution time
static void use(T const &) {}
@@ -104,6 +105,7 @@
static T t;
// refer to instance, causing it to be instantiated (and
// initialized at startup on working compilers)
+ assert(! m_is_destroyed);
use(instance);
return t;
}
@@ -115,11 +117,20 @@
BOOST_DLLEXPORT static const T & get_const_instance(){
return get_instance();
}
+ BOOST_DLLEXPORT static bool is_destroyed(){
+ return m_is_destroyed;
+ }
+ ~singleton(){
+ m_is_destroyed = true;
+ }
};
template<class T>
BOOST_DLLEXPORT T & singleton<T>::instance = singleton<T>::get_instance();
+template<class T>
+bool singleton<T>::m_is_destroyed = false;
+
} // namespace serialization
} // namespace boost
Modified: branches/release/boost/serialization/variant.hpp
==============================================================================
--- branches/release/boost/serialization/variant.hpp (original)
+++ branches/release/boost/serialization/variant.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -33,7 +33,7 @@
#include <boost/mpl/size.hpp>
#include <boost/mpl/empty.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/variant.hpp>
@@ -137,7 +137,7 @@
ar >> BOOST_SERIALIZATION_NVP(which);
if(which >= mpl::size<types>::value)
// this might happen if a type was removed from the list of variant types
- boost::throw_exception(
+ boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::unsupported_version
)
@@ -158,4 +158,3 @@
} // namespace boost
#endif //BOOST_SERIALIZATION_VARIANT_HPP
-
Modified: branches/release/boost/serialization/void_cast.hpp
==============================================================================
--- branches/release/boost/serialization/void_cast.hpp (original)
+++ branches/release/boost/serialization/void_cast.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <boost/smart_cast.hpp>
+#include <boost/serialization/smart_cast.hpp>
#include <boost/serialization/singleton.hpp>
#include <boost/serialization/force_include.hpp>
#include <boost/serialization/type_info_implementation.hpp>
@@ -33,7 +33,7 @@
namespace boost {
namespace serialization {
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) class extended_type_info;
+class extended_type_info;
// Given a void *, assume that it really points to an instance of one type
// and alter it so that it would point to an instance of a related type.
@@ -127,15 +127,17 @@
public void_caster
{
virtual void const * downcast(void const * const t) const {
- const Derived * d = boost::smart_cast<const Derived *, const Base *>(
- static_cast<const Base *>(t)
- );
+ const Derived * d =
+ boost::serialization::smart_cast<const Derived *, const Base *>(
+ static_cast<const Base *>(t)
+ );
return d;
}
virtual void const * upcast(void const * const t) const {
- const Base * b = boost::smart_cast<const Base *, const Derived *>(
- static_cast<const Derived *>(t)
- );
+ const Base * b =
+ boost::serialization::smart_cast<const Base *, const Derived *>(
+ static_cast<const Derived *>(t)
+ );
return b;
}
public:
Modified: branches/release/libs/serialization/build/Jamfile.v2
==============================================================================
--- branches/release/libs/serialization/build/Jamfile.v2 (original)
+++ branches/release/libs/serialization/build/Jamfile.v2 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -8,7 +8,7 @@
project boost/serialization
: source-location ../src
- : requirements <dependency>../../config/test/all//BOOST_NO_STD_LOCALE
+ : requirements
<conditional>@include-spirit
;
@@ -18,7 +18,11 @@
local old-compiler ;
if <toolset>borland in $(properties)
{
- old-compiler = true ;
+ if ! <toolset-borland:version>6.1.0 in $(properties)
+ {
+ old-compiler = true ;
+ }
+
}
else if <toolset>msvc in $(properties)
{
@@ -100,7 +104,6 @@
: $(WSOURCES).cpp boost_serialization
:
<toolset>msvc:<cxxflags>/Gy
- <dependency>../../config/test/all//BOOST_NO_STD_WSTREAMBUF
<link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
;
Modified: branches/release/libs/serialization/example/demo_fast_archive.cpp
==============================================================================
--- branches/release/libs/serialization/example/demo_fast_archive.cpp (original)
+++ branches/release/libs/serialization/example/demo_fast_archive.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -11,7 +11,7 @@
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_array.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#define BOOST_ARCHIVE_SOURCE
#include <boost/archive/binary_oarchive_impl.hpp>
Modified: branches/release/libs/serialization/example/portable_binary_archive.hpp
==============================================================================
--- branches/release/libs/serialization/example/portable_binary_archive.hpp (original)
+++ branches/release/libs/serialization/example/portable_binary_archive.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/static_assert.hpp>
#include <climits>
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -13,7 +13,7 @@
//#include <cstring> // memcpy
#include <boost/detail/endian.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/archive_exception.hpp>
#include "portable_binary_iarchive.hpp"
@@ -33,7 +33,7 @@
size = -size;
if(size > maxsize)
- boost::throw_exception(
+ boost::serialization::throw_exception(
portable_binary_iarchive_exception()
);
@@ -62,7 +62,7 @@
cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
load_override(cn, 0);
if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
- boost::throw_exception(
+ boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::invalid_class_name)
);
@@ -77,8 +77,8 @@
// read signature in an archive version independent manner
std::string file_signature;
* this >> file_signature;
- if(file_signature != boost::archive::ARCHIVE_SIGNATURE())
- boost::throw_exception(
+ if(file_signature != boost::archive::BOOST_ARCHIVE_SIGNATURE())
+ boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::invalid_signature
)
@@ -89,8 +89,8 @@
* this >> input_library_version;
// extra little .t is to get around borland quirk
- if(boost::archive::ARCHIVE_VERSION() < input_library_version.t)
- boost::throw_exception(
+ if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version.t)
+ boost::serialization::throw_exception(
boost::archive::archive_exception(
boost::archive::archive_exception::unsupported_version
)
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -59,19 +59,19 @@
void
portable_binary_oarchive::init(unsigned int flags) {
if(m_flags == (endian_big | endian_little)){
- boost::throw_exception(
+ boost::serialization::throw_exception(
portable_binary_oarchive_exception()
);
}
if(0 == (flags & boost::archive::no_header)){
// write signature in an archive version independent manner
const std::string file_signature(
- boost::archive::ARCHIVE_SIGNATURE()
+ boost::archive::BOOST_ARCHIVE_SIGNATURE()
);
* this << file_signature;
// write library version
const boost::archive::version_type v(
- boost::archive::ARCHIVE_VERSION()
+ boost::archive::BOOST_ARCHIVE_VERSION()
);
* this << v;
}
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -42,7 +42,7 @@
//This should never ever change. note that is not an std::string
// string.
BOOST_ARCHIVE_DECL(const char *)
-ARCHIVE_SIGNATURE(){
+BOOST_ARCHIVE_SIGNATURE(){
return "serialization::archive";
}
@@ -59,7 +59,7 @@
// types caused backwards compatibility breaking change in 1.35
BOOST_ARCHIVE_DECL(unsigned char)
-ARCHIVE_VERSION(){
+BOOST_ARCHIVE_VERSION(){
return 5;
}
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,8 +24,8 @@
#endif
#include <boost/limits.hpp>
-#include <boost/state_saver.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/state_saver.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/tracking.hpp>
#include <boost/archive/archive_exception.hpp>
@@ -162,7 +162,7 @@
version_type pending_version;
basic_iarchive_impl(unsigned int flags) :
- m_archive_library_version(ARCHIVE_VERSION()),
+ m_archive_library_version(BOOST_ARCHIVE_VERSION()),
m_flags(flags),
moveable_objects_start(0),
moveable_objects_end(0),
@@ -367,7 +367,7 @@
load_preamble(ar, co);
// save the current move stack position in case we want to truncate it
- boost::state_saver<object_id_type> w(moveable_objects_start);
+ boost::serialization::state_saver<object_id_type> w(moveable_objects_start);
// note: extra line used to evade borland issue
const bool tracking = co.tracking_level;
@@ -424,7 +424,7 @@
if(0 != key[0])
eti = serialization::extended_type_info::find(key);
if(NULL == eti)
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unregistered_class)
);
bpis_ptr = (*finder)(*eti);
@@ -449,15 +449,15 @@
return bpis_ptr;
// save state
- state_saver<object_id_type> w_start(moveable_objects_start);
+ serialization::state_saver<object_id_type> w_start(moveable_objects_start);
if(! tracking){
bpis_ptr->load_object_ptr(ar, t, co.file_version);
}
else{
- state_saver<void *> x(pending_object);
- state_saver<const basic_iserializer *> y(pending_bis);
- state_saver<version_type> z(pending_version);
+ serialization::state_saver<void *> x(pending_object);
+ serialization::state_saver<const basic_iserializer *> y(pending_bis);
+ serialization::state_saver<version_type> z(pending_version);
pending_bis = & bpis_ptr->get_basic_serializer();
pending_version = co.file_version;
@@ -465,7 +465,7 @@
// predict next object id to be created
const unsigned int ui = object_id_vector.size();
- state_saver<object_id_type> w_end(moveable_objects_end);
+ serialization::state_saver<object_id_type> w_end(moveable_objects_end);
// because the following operation could move the items
// don't use co after this
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -15,8 +15,8 @@
#include <cstddef> // NULL
#include <boost/limits.hpp>
-#include <boost/state_saver.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/state_saver.hpp>
+#include <boost/serialization/throw_exception.hpp>
// including this here to work around an ICC in intel 7.0
// normally this would be part of basic_oarchive.hpp below.
@@ -289,7 +289,7 @@
if(stored_pointers.end() != stored_pointers.find(oid)){
// this has to be a user error. loading such an archive
// would create duplicate objects
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::pointer_conflict)
);
}
@@ -329,7 +329,7 @@
else
// without an external class name
// we won't be able to de-serialize it so bail now
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::unregistered_class)
);
}
@@ -348,8 +348,8 @@
if(! bos.tracking(m_flags)){
// just save the data itself
ar.end_preamble();
- state_saver<const void *> x(pending_object);
- state_saver<const basic_oserializer *> y(pending_bos);
+ serialization::state_saver<const void *> x(pending_object);
+ serialization::state_saver<const basic_oserializer *> y(pending_bos);
pending_object = t;
pending_bos = & bpos_ptr->get_basic_serializer();
bpos_ptr->save_object_ptr(ar, t);
@@ -376,8 +376,8 @@
ar.end_preamble();
// and save the object itself
- state_saver<const void *> x(pending_object);
- state_saver<const basic_oserializer *> y(pending_bos);
+ serialization::state_saver<const void *> x(pending_object);
+ serialization::state_saver<const basic_oserializer *> y(pending_bos);
pending_object = t;
pending_bos = & bpos_ptr->get_basic_serializer();
bpos_ptr->save_object_ptr(ar, t);
@@ -430,7 +430,7 @@
BOOST_ARCHIVE_DECL(unsigned int)
basic_oarchive::get_library_version() const{
- return ARCHIVE_VERSION();
+ return BOOST_ARCHIVE_VERSION();
}
BOOST_ARCHIVE_DECL(unsigned int)
Modified: branches/release/libs/serialization/src/basic_xml_archive.cpp
==============================================================================
--- branches/release/libs/serialization/src/basic_xml_archive.cpp (original)
+++ branches/release/libs/serialization/src/basic_xml_archive.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -15,35 +15,35 @@
namespace archive {
BOOST_ARCHIVE_DECL(const char *)
-OBJECT_ID(){
+BOOST_ARCHIVE_XML_OBJECT_ID(){
return "object_id";
}
BOOST_ARCHIVE_DECL(const char *)
-OBJECT_REFERENCE(){
+BOOST_ARCHIVE_XML_OBJECT_REFERENCE(){
return "object_id_reference";
}
BOOST_ARCHIVE_DECL(const char *)
-CLASS_ID(){
+BOOST_ARCHIVE_XML_CLASS_ID(){
return "class_id";
}
BOOST_ARCHIVE_DECL(const char *)
-CLASS_ID_REFERENCE(){
+BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE(){
return "class_id_reference";
}
BOOST_ARCHIVE_DECL(const char *)
-CLASS_NAME(){
+BOOST_ARCHIVE_XML_CLASS_NAME(){
return "class_name";
}
BOOST_ARCHIVE_DECL(const char *)
-TRACKING(){
+BOOST_ARCHIVE_XML_TRACKING(){
return "tracking_level";
}
BOOST_ARCHIVE_DECL(const char *)
-VERSION(){
+BOOST_ARCHIVE_XML_VERSION(){
return "version";
}
BOOST_ARCHIVE_DECL(const char *)
-SIGNATURE(){
+BOOST_ARCHIVE_XML_SIGNATURE(){
return "signature";
}
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,10 +24,10 @@
// for head_iterator test
//#include <boost/bind.hpp>
#include <boost/function.hpp>
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/io/ios_state.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/archive/impl/basic_xml_grammar.hpp>
#include <boost/archive/xml_archive_exception.hpp>
#include <boost/archive/basic_xml_archive.hpp>
@@ -157,9 +157,9 @@
BOOST_DEDUCED_TYPENAME basic_xml_grammar<CharType>::IStream & is,
const rule_t & rule_,
CharType delimiter
-){
+) const {
if(is.fail()){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -183,17 +183,17 @@
// is terminated. This will permit the archive to be used for debug
// and transaction data logging in the standard way.
- parse_info<BOOST_DEDUCED_TYPENAME std::basic_string<CharType>::iterator> result
- = boost::spirit::parse(arg.begin(), arg.end(), rule_);
+ parse_info<BOOST_DEDUCED_TYPENAME std::basic_string<CharType>::iterator>
+ result = boost::spirit::parse(arg.begin(), arg.end(), rule_);
return result.hit;
}
template<class CharType>
bool basic_xml_grammar<CharType>::parse_start_tag(
BOOST_DEDUCED_TYPENAME basic_xml_grammar<CharType>::IStream & is
-) {
+){
if(is.fail()){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -202,9 +202,9 @@
}
template<class CharType>
-bool basic_xml_grammar<CharType>::parse_end_tag(IStream & is) {
+bool basic_xml_grammar<CharType>::parse_end_tag(IStream & is) const {
if(is.fail()){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -212,9 +212,9 @@
}
template<class CharType>
-bool basic_xml_grammar<CharType>::parse_string(IStream & is, StringType & s) {
+bool basic_xml_grammar<CharType>::parse_string(IStream & is, StringType & s){
if(is.fail()){
- boost::throw_exception(
+ boost::serialization::throw_exception(
archive_exception(archive_exception::stream_error)
);
}
@@ -310,15 +310,18 @@
;
ClassIDAttribute =
- str_p(CLASS_ID()) >> NameTail
+ str_p(BOOST_ARCHIVE_XML_CLASS_ID()) >> NameTail
>> Eq
>> L'"'
>> int_p [xml::assign_object(rv.class_id.t)]
>> L'"'
;
- ObjectIDAttribute =
- (str_p(OBJECT_ID()) | str_p(OBJECT_REFERENCE()) )
+ ObjectIDAttribute = (
+ str_p(BOOST_ARCHIVE_XML_OBJECT_ID())
+ |
+ str_p(BOOST_ARCHIVE_XML_OBJECT_REFERENCE())
+ )
>> NameTail
>> Eq
>> L'"'
@@ -342,7 +345,7 @@
;
ClassNameAttribute =
- str_p(CLASS_NAME())
+ str_p(BOOST_ARCHIVE_XML_CLASS_NAME())
>> Eq
>> L'"'
>> ClassName
@@ -350,7 +353,7 @@
;
TrackingAttribute =
- str_p(TRACKING())
+ str_p(BOOST_ARCHIVE_XML_TRACKING())
>> Eq
>> L'"'
>> uint_p [xml::assign_level(rv.tracking_level)]
@@ -358,7 +361,7 @@
;
VersionAttribute =
- str_p(VERSION())
+ str_p(BOOST_ARCHIVE_XML_VERSION())
>> Eq
>> L'"'
>> uint_p [xml::assign_object(rv.version.t)]
@@ -427,19 +430,19 @@
void basic_xml_grammar<CharType>::init(IStream & is){
init_chset();
if(! my_parse(is, XMLDecl))
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
if(! my_parse(is, DocTypeDecl))
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
if(! my_parse(is, SerializationWrapper))
- boost::throw_exception(
+ boost::serialization::throw_exception(
xml_archive_exception(xml_archive_exception::xml_archive_parsing_error)
);
- if(! std::equal(rv.class_name.begin(), rv.class_name.end(), ARCHIVE_SIGNATURE()))
- boost::throw_exception(
+ if(! std::equal(rv.class_name.begin(), rv.class_name.end(), BOOST_ARCHIVE_SIGNATURE()))
+ boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_signature)
);
}
Modified: branches/release/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- branches/release/libs/serialization/src/extended_type_info.cpp (original)
+++ branches/release/libs/serialization/src/extended_type_info.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -85,19 +85,20 @@
BOOST_SERIALIZATION_DECL(void)
extended_type_info::key_unregister() {
assert(NULL != m_key);
- detail::ktmap & x = singleton<detail::ktmap>::get_mutable_instance();
- detail::ktmap::iterator start = x.lower_bound(this);
- detail::ktmap::iterator end = x.upper_bound(this);
- assert(start != end);
-
- // remove entry in map which corresponds to this type
- do{
- if(this == *start){
- x.erase(start);
- break;
- }
- }while(++start != end);
-
+ if(! singleton<detail::ktmap>::is_destroyed()){
+ detail::ktmap & x = singleton<detail::ktmap>::get_mutable_instance();
+ detail::ktmap::iterator start = x.lower_bound(this);
+ detail::ktmap::iterator end = x.upper_bound(this);
+ assert(start != end);
+
+ // remove entry in map which corresponds to this type
+ do{
+ if(this == *start)
+ x.erase(start++);
+ else
+ ++start;
+ }while(start != end);
+ }
m_key = NULL;
}
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -48,16 +48,19 @@
extended_type_info_typeid_0::is_less_than(
const boost::serialization::extended_type_info & rhs
) const {
- return m_ti->before(
+ return static_cast<bool>(m_ti->before(
*(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti)
- );
+ ));
}
BOOST_SERIALIZATION_DECL(bool)
extended_type_info_typeid_0::is_equal(
const boost::serialization::extended_type_info & rhs
) const {
- return * m_ti == *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti);
+ return static_cast<bool>(
+ * m_ti
+ == *(static_cast<const extended_type_info_typeid_0 &>(rhs).m_ti)
+ );
}
BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
@@ -79,22 +82,22 @@
BOOST_SERIALIZATION_DECL(void)
extended_type_info_typeid_0::type_unregister()
{
- if(NULL == m_ti)
- return;
-
- tkmap & x = singleton<tkmap>::get_mutable_instance();
- tkmap::iterator start = x.lower_bound(this);
- tkmap::iterator end = x.upper_bound(this);
- assert(start != end);
-
- // remove entry in map which corresponds to this type
- do{
- if(this == *start){
- x.erase(start);
- break;
+ if(NULL == m_ti){
+ if(! singleton<tkmap>::is_destroyed()){
+ tkmap & x = singleton<tkmap>::get_mutable_instance();
+ tkmap::iterator start = x.lower_bound(this);
+ tkmap::iterator end = x.upper_bound(this);
+ assert(start != end);
+
+ // remove entry in map which corresponds to this type
+ do{
+ if(this == *start)
+ x.erase(start++);
+ else
+ ++start;
+ }while(start != end);
+ }
}
- }while(++start != end);
-
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 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -34,28 +34,7 @@
namespace serialization {
namespace void_cast_detail {
-#if 0
-// registry of casting objects
-struct void_caster_compare
-{
- bool
- operator()(
- const void_caster * lhs,
- const void_caster * rhs
- ) const {
- if( lhs->m_derived < rhs->m_derived )
- return true;
- if( lhs->m_base < rhs->m_base )
- return true;
- return false;
- }
-};
-
-typedef std::set<const void_caster *, void_caster_compare> set_type;
-#endif
-
typedef std::vector<const void_caster *> set_type;
-
typedef boost::serialization::singleton<set_type> void_caster_registry;
inline bool
@@ -93,21 +72,23 @@
BOOST_SERIALIZATION_DECL(void)
void_caster::static_unregister() const {
- void_cast_detail::set_type & st
- = void_caster_registry::get_mutable_instance();
- void_cast_detail::set_type::iterator it;
- it = std::find(st.begin(), st.end(), this);
- assert(st.end() != it);
- st.erase(it);
- // to do - remove all void_caster_derived entries
- // which depend upon this primitive
- /*
- while(){
- if(!truncate_down(this)
- && !truncate_up(this))
- break;
+ if(! void_caster_registry::is_destroyed()){
+ void_cast_detail::set_type & st
+ = void_caster_registry::get_mutable_instance();
+ void_cast_detail::set_type::iterator it;
+ it = std::find(st.begin(), st.end(), this);
+ assert(st.end() != it);
+ st.erase(it);
+ // to do - remove all void_caster_derived entries
+ // which depend upon this primitive
+ /*
+ while(){
+ if(!truncate_down(this)
+ && !truncate_up(this))
+ break;
+ }
+ */
}
- */
}
#if 0
Modified: branches/release/libs/serialization/src/xml_wgrammar.cpp
==============================================================================
--- branches/release/libs/serialization/src/xml_wgrammar.cpp (original)
+++ branches/release/libs/serialization/src/xml_wgrammar.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -47,103 +47,6 @@
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
// specific definitions for wchar_t based XML
-#if 0
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::
- #if defined(__GNUC__) && defined(linux)
- Char(L"\x9\xA\xD\x20-\xD7FF\xE000-\xFFFD\x10000-\x10FFFF");
- #else
- Char(L"\x9\xA\xD\x20-\xD7FF\xE000-\xFFFD");
- #endif
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::Sch(L"\x20\x9\xD\xA");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::BaseChar (
- L"\x41-\x5A\x61-\x7A\xC0-\xD6\xD8-\xF6\xF8-\xFF\x100-\x131\x134-\x13E"
- L"\x141-\x148\x14A-\x17E\x180-\x1C3\x1CD-\x1F0\x1F4-\x1F5\x1FA-\x217"
- L"\x250-\x2A8\x2BB-\x2C1\x386\x388-\x38A\x38C\x38E-\x3A1\x3A3-\x3CE"
- L"\x3D0-\x3D6\x3DA\x3DC\x3DE\x3E0\x3E2-\x3F3\x401-\x40C\x40E-\x44F"
- L"\x451-\x45C\x45E-\x481\x490-\x4C4\x4C7-\x4C8\x4CB-\x4CC\x4D0-\x4EB"
- L"\x4EE-\x4F5\x4F8-\x4F9\x531-\x556\x559\x561-\x586\x5D0-\x5EA"
- L"\x5F0-\x5F2\x621-\x63A\x641-\x64A\x671-\x6B7\x6BA-\x6BE\x6C0-\x6CE"
- L"\x6D0-\x6D3\x6D5\x6E5-\x6E6\x905-\x939\x93D\x958-\x961\x985-\x98C"
- L"\x98F-\x990\x993-\x9A8\x9AA-\x9B0\x9B2\x9B6-\x9B9\x9DC-\x9DD"
- L"\x9DF-\x9E1\x9F0-\x9F1\xA05-\xA0A\xA0F-\xA10\xA13-\xA28\xA2A-\xA30"
- L"\xA32-\xA33\xA35-\xA36\xA38-\xA39\xA59-\xA5C\xA5E\xA72-\xA74"
- L"\xA85-\xA8B\xA8D\xA8F-\xA91\xA93-\xAA8\xAAA-\xAB0\xAB2-\xAB3"
- L"\xAB5-\xAB9\xABD\xAE0\xB05-\xB0C\xB0F-\xB10\xB13-\xB28\xB2A-\xB30"
- L"\xB32-\xB33\xB36-\xB39\xB3D\xB5C-\xB5D\xB5F-\xB61\xB85-\xB8A"
- L"\xB8E-\xB90\xB92-\xB95\xB99-\xB9A\xB9C\xB9E-\xB9F\xBA3-\xBA4"
- L"\xBA8-\xBAA\xBAE-\xBB5\xBB7-\xBB9\xC05-\xC0C\xC0E-\xC10\xC12-\xC28"
- L"\xC2A-\xC33\xC35-\xC39\xC60-\xC61\xC85-\xC8C\xC8E-\xC90\xC92-\xCA8"
- L"\xCAA-\xCB3\xCB5-\xCB9\xCDE\xCE0-\xCE1\xD05-\xD0C\xD0E-\xD10"
- L"\xD12-\xD28\xD2A-\xD39\xD60-\xD61\xE01-\xE2E\xE30\xE32-\xE33"
- L"\xE40-\xE45\xE81-\xE82\xE84\xE87-\xE88\xE8A\xE8D\xE94-\xE97"
- L"\xE99-\xE9F\xEA1-\xEA3\xEA5\xEA7\xEAA-\xEAB\xEAD-\xEAE\xEB0"
- L"\xEB2-\xEB3\xEBD\xEC0-\xEC4\xF40-\xF47\xF49-\xF69\x10A0-\x10C5"
- L"\x10D0-\x10F6\x1100\x1102-\x1103\x1105-\x1107\x1109\x110B-\x110C"
- L"\x110E-\x1112\x113C\x113E\x1140\x114C\x114E\x1150\x1154-\x1155"
- L"\x1159\x115F-\x1161\x1163\x1165\x1167\x1169\x116D-\x116E"
- L"\x1172-\x1173\x1175\x119E\x11A8\x11AB\x11AE-\x11AF\x11B7-\x11B8"
- L"\x11BA\x11BC-\x11C2\x11EB\x11F0\x11F9\x1E00-\x1E9B\x1EA0-\x1EF9"
- L"\x1F00-\x1F15\x1F18-\x1F1D\x1F20-\x1F45\x1F48-\x1F4D\x1F50-\x1F57"
- L"\x1F59\x1F5B\x1F5D\x1F5F-\x1F7D\x1F80-\x1FB4\x1FB6-\x1FBC\x1FBE"
- L"\x1FC2-\x1FC4\x1FC6-\x1FCC\x1FD0-\x1FD3\x1FD6-\x1FDB\x1FE0-\x1FEC"
- L"\x1FF2-\x1FF4\x1FF6-\x1FFC\x2126\x212A-\x212B\x212E\x2180-\x2182"
- L"\x3041-\x3094\x30A1-\x30FA\x3105-\x312C\xAC00-\xD7A3");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::Ideographic(
- L"\x4E00-\x9FA5\x3007\x3021-\x3029");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::Letter = BaseChar | Ideographic;
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::CombiningChar(
- L"\x0300-\x0345\x0360-\x0361\x0483-\x0486\x0591-\x05A1\x05A3-\x05B9"
- L"\x05BB-\x05BD\x05BF\x05C1-\x05C2\x05C4\x064B-\x0652\x0670"
- L"\x06D6-\x06DC\x06DD-\x06DF\x06E0-\x06E4\x06E7-\x06E8\x06EA-\x06ED"
- L"\x0901-\x0903\x093C\x093E-\x094C\x094D\x0951-\x0954\x0962-\x0963"
- L"\x0981-\x0983\x09BC\x09BE\x09BF\x09C0-\x09C4\x09C7-\x09C8"
- L"\x09CB-\x09CD\x09D7\x09E2-\x09E3\x0A02\x0A3C\x0A3E\x0A3F"
- L"\x0A40-\x0A42\x0A47-\x0A48\x0A4B-\x0A4D\x0A70-\x0A71\x0A81-\x0A83"
- L"\x0ABC\x0ABE-\x0AC5\x0AC7-\x0AC9\x0ACB-\x0ACD\x0B01-\x0B03\x0B3C"
- L"\x0B3E-\x0B43\x0B47-\x0B48\x0B4B-\x0B4D\x0B56-\x0B57\x0B82-\x0B83"
- L"\x0BBE-\x0BC2\x0BC6-\x0BC8\x0BCA-\x0BCD\x0BD7\x0C01-\x0C03"
- L"\x0C3E-\x0C44\x0C46-\x0C48\x0C4A-\x0C4D\x0C55-\x0C56\x0C82-\x0C83"
- L"\x0CBE-\x0CC4\x0CC6-\x0CC8\x0CCA-\x0CCD\x0CD5-\x0CD6\x0D02-\x0D03"
- L"\x0D3E-\x0D43\x0D46-\x0D48\x0D4A-\x0D4D\x0D57\x0E31\x0E34-\x0E3A"
- L"\x0E47-\x0E4E\x0EB1\x0EB4-\x0EB9\x0EBB-\x0EBC\x0EC8-\x0ECD"
- L"\x0F18-\x0F19\x0F35\x0F37\x0F39\x0F3E\x0F3F\x0F71-\x0F84"
- L"\x0F86-\x0F8B\x0F90-\x0F95\x0F97\x0F99-\x0FAD\x0FB1-\x0FB7\x0FB9"
- L"\x20D0-\x20DC\x20E1\x302A-\x302F\x3099\x309A");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::Digit(
- L"\x0030-\x0039\x0660-\x0669\x06F0-\x06F9\x0966-\x096F\x09E6-\x09EF"
- L"\x0A66-\x0A6F\x0AE6-\x0AEF\x0B66-\x0B6F\x0BE7-\x0BEF\x0C66-\x0C6F"
- L"\x0CE6-\x0CEF\x0D66-\x0D6F\x0E50-\x0E59\x0ED0-\x0ED9\x0F20-\x0F29");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::Extender(
- L"\x00B7\x02D0\x02D1\x0387\x0640\x0E46\x0EC6\x3005\x3031-\x3035"
- L"\x309D-\x309E\x30FC-\x30FE");
-
-template<>
-const xml_wgrammar::chset_t xml_wgrammar::NameChar =
- Letter
- | Digit
- | L'.'
- | L'-'
- | L'_'
- | L':'
- | CombiningChar
- | Extender;
-#endif
-
template<>
void xml_wgrammar::init_chset(){
Char = chset_t(
Modified: branches/release/libs/serialization/src/xml_woarchive.cpp
==============================================================================
--- branches/release/libs/serialization/src/xml_woarchive.cpp (original)
+++ branches/release/libs/serialization/src/xml_woarchive.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -38,7 +38,7 @@
if(0 == result)
break;
else
- boost::throw_exception(
+ boost::serialization::throw_exception(
iterators::dataflow_exception(
iterators::dataflow_exception::invalid_conversion
)
Modified: branches/release/libs/serialization/test/D.hpp
==============================================================================
--- branches/release/libs/serialization/test/D.hpp (original)
+++ branches/release/libs/serialization/test/D.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -20,7 +20,7 @@
#include "test_tools.hpp"
#include <boost/detail/no_exceptions_support.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/split_member.hpp>
#include "B.hpp"
Modified: branches/release/libs/serialization/test/test_binary.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_binary.cpp (original)
+++ branches/release/libs/serialization/test/test_binary.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -65,12 +65,32 @@
BOOST_REQUIRE(NULL != testfile);
const A a;
- A a1;
+ char s1[] = "a";
+ char s2[] = "ab";
+ char s3[] = "abc";
+ char s4[] = "abcd";
const int i = 12345;
+ A a1;
+ char s1_1[10];
+ char s1_2[10];
+ char s1_3[10];
+ char s1_4[10];
int i1 = 34790;
{
test_ostream os(testfile, TEST_STREAM_FLAGS);
test_oarchive oa(os, TEST_ARCHIVE_FLAGS);
+ boost::serialization::make_nvp(
+ "s1", boost::serialization::make_binary_object(s1, sizeof(s1))
+ );
+ oa << boost::serialization::make_nvp(
+ "s2", boost::serialization::make_binary_object(s2, sizeof(s2))
+ );
+ oa << boost::serialization::make_nvp(
+ "s3", boost::serialization::make_binary_object(s3, sizeof(s3))
+ );
+ oa << boost::serialization::make_nvp(
+ "s4", boost::serialization::make_binary_object(s4, sizeof(s4))
+ );
oa << BOOST_SERIALIZATION_NVP(a);
// note: add a little bit on the end of the archive to detect
// failure of text mode binary.
@@ -79,7 +99,21 @@
{
test_istream is(testfile, TEST_STREAM_FLAGS);
test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
+ boost::serialization::make_nvp(
+ "s1", boost::serialization::make_binary_object(s1_1, sizeof(s1))
+ );
+ ia >> boost::serialization::make_nvp(
+ "s2", boost::serialization::make_binary_object(s1_2, sizeof(s2))
+ );
+ ia >> boost::serialization::make_nvp(
+ "s3", boost::serialization::make_binary_object(s1_3, sizeof(s3))
+ );
+ ia >> boost::serialization::make_nvp(
+ "s4", boost::serialization::make_binary_object(s1_4, sizeof(s4))
+ );
ia >> BOOST_SERIALIZATION_NVP(a1);
+ // note: add a little bit on the end of the archive to detect
+ // failure of text mode binary.
ia >> BOOST_SERIALIZATION_NVP(i1);
}
BOOST_CHECK(i == i1);
Modified: branches/release/libs/serialization/test/test_delete_pointer.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_delete_pointer.cpp (original)
+++ branches/release/libs/serialization/test/test_delete_pointer.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -20,7 +20,7 @@
#include "test_tools.hpp"
#include <boost/detail/no_exceptions_support.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/split_member.hpp>
@@ -42,7 +42,7 @@
static int i = 0;
ar >> BOOST_SERIALIZATION_NVP(next_);
if(++i == 3)
- boost::throw_exception(boost::archive::archive_exception(
+ boost::serialization::throw_exception(boost::archive::archive_exception(
boost::archive::archive_exception::no_exception
));
}
Modified: branches/release/libs/serialization/test/test_diamond.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_diamond.cpp (original)
+++ branches/release/libs/serialization/test/test_diamond.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -30,8 +30,6 @@
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/export.hpp>
-using namespace boost;
-
int save_count = 0; // used to detect when base class is saved multiple times
int load_count = 0; // used to detect when base class is loaded multiple times
Modified: branches/release/libs/serialization/test/test_exported.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_exported.cpp (original)
+++ branches/release/libs/serialization/test/test_exported.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -19,8 +19,8 @@
}
#endif
-#include <boost/serialization/base_object.hpp>
#include <boost/serialization/export.hpp>
+#include <boost/serialization/base_object.hpp>
#include <boost/serialization/type_info_implementation.hpp>
#include <boost/archive/archive_exception.hpp>
Modified: branches/release/libs/serialization/test/test_iterators_base64.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_iterators_base64.cpp (original)
+++ branches/release/libs/serialization/test/test_iterators_base64.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -24,7 +24,7 @@
}
#endif
-#include <boost/pfto.hpp>
+#include <boost/serialization/pfto.hpp>
#include <boost/archive/iterators/binary_from_base64.hpp>
#include <boost/archive/iterators/base64_from_binary.hpp>
Modified: branches/release/libs/serialization/test/test_private_ctor.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_private_ctor.cpp (original)
+++ branches/release/libs/serialization/test/test_private_ctor.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -16,29 +16,36 @@
#include <boost/archive/text_oarchive.hpp>
class V {
- int m_i;
+ friend int test_main(int /* argc */, char * /* argv */[]);
friend class boost::serialization::access;
- V() {}
+ int m_i;
+ V() :
+ m_i(0)
+ {}
+ ~V(){}
template<class Archive>
void serialize(Archive& ar, unsigned version)
{
ar & m_i;
- }
+ }
+ bool operator==(const V & v) const {
+ return m_i == v.m_i;
+ }
};
int test_main(int /* argc */, char * /* argv */[])
{
std::stringstream ss;
- const std::vector<V> v;
+ const V v;
{
boost::archive::text_oarchive oa(ss);
oa << v;
}
- std::vector<V> v1;
+ V v1;
{
boost::archive::text_iarchive ia(ss);
ia >> v1;
}
- //BOOST_CHECK(v == v1);
+ BOOST_CHECK(v == v1);
return EXIT_SUCCESS;
}
Modified: branches/release/libs/serialization/test/test_smart_cast.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_smart_cast.cpp (original)
+++ branches/release/libs/serialization/test/test_smart_cast.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -8,12 +8,12 @@
// <gennadiy.rozental_at_[hidden]>
#include <exception>
-#include <boost/smart_cast.hpp>
+#include <boost/serialization/smart_cast.hpp>
#include "test_tools.hpp"
#include <boost/noncopyable.hpp>
-using namespace boost;
+using namespace boost::serialization;
class Base1 : public boost::noncopyable
{
Modified: branches/release/libs/serialization/test/test_static_warning.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_static_warning.cpp (original)
+++ branches/release/libs/serialization/test/test_static_warning.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -8,7 +8,7 @@
// note: this is a compile only test.
#include <boost/config.hpp> // BOOST_STATIC_CONST
-#include <boost/static_warning.hpp>
+#include <boost/serialization/static_warning.hpp>
#include <boost/type_traits/is_polymorphic.hpp>
#pragma warning(disable:4094)
Modified: branches/release/libs/serialization/test/test_tools.hpp
==============================================================================
--- branches/release/libs/serialization/test/test_tools.hpp (original)
+++ branches/release/libs/serialization/test/test_tools.hpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -74,21 +74,22 @@
namespace archive {
char * test_filename(char * dir = NULL, char *fname = NULL){
static char ibuffer [512];
-
- if(NULL == dir)
+ int i;
+ ibuffer[0] = '\0';
+ if(NULL == dir){
dir = boost::archive::tmpdir();
-
+ }
+ STRCPY(ibuffer, dir);
+ std::strcat(ibuffer, "/");
+ i = std::strlen(ibuffer);
if(NULL == fname){
char old_dir[256];
_getcwd(old_dir, sizeof(old_dir) - 1);
chdir(dir);
-
- std::tmpnam(ibuffer);
+ std::tmpnam(ibuffer + i);
chdir(old_dir);
}
else{
- STRCPY(ibuffer, dir);
- std::strcat(ibuffer, "/");
std::strcat(ibuffer, fname);
}
return ibuffer;
Modified: branches/release/libs/serialization/test/test_variant.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_variant.cpp (original)
+++ branches/release/libs/serialization/test/test_variant.cpp 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -29,7 +29,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/serialization/throw_exception.hpp>
#if defined(_MSC_VER) && (_MSC_VER <= 1020)
# pragma warning (disable : 4786) // too long name, harmless warning
Modified: branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln
==============================================================================
--- branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln (original)
+++ branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -42,6 +42,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_delete_pointer", "test_delete_pointer.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_deque", "test_deque.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
@@ -54,10 +56,14 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_diamond", "test_diamond.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_exported", "test_exported.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "test_iterators.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
@@ -134,6 +140,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_private_ctor", "test_private_ctor.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_recursion", "test_recursion.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
@@ -151,10 +159,6 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_simple_class", "test_simple_class.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_simple_class_ptr", "test_simple_class_ptr.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -270,6 +274,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_reset_object_address", "test_reset_object_addr.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_strong_typedef", "test_strong_typedef.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
@@ -315,6 +321,12 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_simple_class", "test_simple_class.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_zmisc", "test_zmisc.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -382,8 +394,8 @@
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+ {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+ {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
@@ -1142,84 +1154,84 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.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-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic text_warchive|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.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 binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|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}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|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-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static xml_warchive|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
@@ -1376,162 +1388,162 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.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-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic text_warchive|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.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 binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|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}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|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-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.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-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic text_warchive|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.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 binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|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}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|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-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static xml_warchive|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
@@ -3326,84 +3338,6 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-dynamic text_archive|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-dynamic text_archive|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-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.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 binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|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}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static threading-multi|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-dynamic binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.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
@@ -5764,8 +5698,8 @@
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static threading-multi|Win32
- {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static threading-multi|Win32
- {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static threading-multi|Win32
+ {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+ {30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static threading-multi|Win32
{30E10563-960A-11D7-9FE9-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi|Win32
@@ -6524,6 +6458,84 @@
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static threading-multi|Win32
{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-dynamic threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic threading-multi|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.ActiveCfg = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic binary_archive.Build.0 = Release runtime-dynamic binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.ActiveCfg = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_archive.Build.0 = Release runtime-dynamic text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.ActiveCfg = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic text_warchive.Build.0 = Release runtime-dynamic text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.ActiveCfg = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_archive.Build.0 = Release runtime-dynamic xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.ActiveCfg = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic xml_warchive.Build.0 = Release runtime-dynamic xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-static binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-static text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-static text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-static threading-multi binary_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-static threading-multi text_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-static threading-multi text_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-static threading-multi xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-static threading-multi xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-static xml_archive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static xml_warchive|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-static xml_warchive|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
Modified: branches/release/libs/serialization/vc7ide/Library.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/Library.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/Library.vcproj 2008-10-07 01:34:46 EDT (Tue, 07 Oct 2008)
@@ -147,7 +147,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_34_1.lib"/>
+ OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_37.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -183,7 +183,7 @@
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
SmallerTypeCheck="FALSE"
- RuntimeLibrary="1"
+ RuntimeLibrary="5"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
@@ -198,7 +198,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/libboost_serialization-vc71-mt-sgd-1_34_1.lib"/>
+ OutputFile="$(OutDir)/libboost_serialization-vc71-sgd-1_3y.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -463,6 +463,9 @@
RelativePath="..\..\..\boost\serialization\hash_set.hpp">
</File>
<File
+ RelativePath="..\..\..\boost\serialization\is_bitwise_serializable.hpp">
+ </File>
+ <File
RelativePath="..\..\..\boost\serialization\list.hpp">
</File>
<File
@@ -504,6 +507,9 @@
<File
RelativePath="..\..\..\boost\serialization\weak_ptr.hpp">
</File>
+ <File
+ RelativePath="..\..\..\boost\serialization\wrapper.hpp">
+ </File>
<Filter
Name="detail"
Filter="">
@@ -674,22 +680,25 @@
RelativePath="..\..\..\boost\serialization\force_include.hpp">
</File>
<File
- RelativePath="..\..\..\boost\pfto.hpp">
+ RelativePath="..\..\..\boost\serialization\pfto.hpp">
</File>
<File
RelativePath="..\..\..\boost\serialization\singleton.hpp">
</File>
<File
- RelativePath="..\..\..\boost\smart_cast.hpp">
+ RelativePath="..\..\..\boost\serialization\smart_cast.hpp">
+ </File>
+ <File
+ RelativePath="..\..\..\boost\serialization\state_saver.hpp">
</File>
<File
- RelativePath="..\..\..\boost\state_saver.hpp">
+ RelativePath="..\..\..\boost\serialization\static_warning.hpp">
</File>
<File
- RelativePath="..\..\..\boost\static_warning.hpp">
+ RelativePath="..\..\..\boost\serialization\strong_typedef.hpp">
</File>
<File
- RelativePath="..\..\..\boost\strong_typedef.hpp">
+ RelativePath="..\..\..\boost\serialization\throw_exception.hpp">
</File>
<File
RelativePath="..\..\..\boost\archive\tmpdir.hpp">
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