XML serialization only works with version 1.6x of spirit. In order to build
and use this library with this compiler, one must use version 1.6x rather than the
diff --git a/doc/singleton.html b/doc/singleton.html
index 80f71c88..abf94429 100644
--- a/doc/singleton.html
+++ b/doc/singleton.html
@@ -138,16 +138,15 @@ In order to be used as
singleton<T>
-
-
-, the type T must be default constructable.
+
+, the type T must be default constructable.
It doesn't require static variables - though it may have them.
Since the library guarentees that only one instance of
singleton<T>
-
-
+
+
and all accesss is through the above static interface
functions, common member functions of T become
the functional equivalent of
@@ -162,12 +161,12 @@ The first way is illustrated by and excerpt from the file
which contains the following code:
-typedef std::set ktmap;
+typedef std::set<const extended_type_info *, key_compare> ktmap;
...
void
extended_type_info::key_register(const char *key) {
...
- result = singleton::get_mutable_instance().insert(this);
+ result = singleton<ktmap>::get_mutable_instance().insert(this);
...
}
diff --git a/doc/tutorial.html b/doc/tutorial.html
index 8154611f..eded26e7 100644
--- a/doc/tutorial.html
+++ b/doc/tutorial.html
@@ -327,7 +327,7 @@ clas pointer may require explicit enumeration of the derived
classes to be serialized. This is referred to as "registration" or "export"
of derived classes. This requirement and the methods of
satisfying it are explained in detail
-here
+here.
All this is accomplished automatically by the serialization
library. The above code is all that is necessary to accomplish
diff --git a/example/portable_binary_iarchive.hpp b/example/portable_binary_iarchive.hpp
index 21f7097d..a982dd80 100644
--- a/example/portable_binary_iarchive.hpp
+++ b/example/portable_binary_iarchive.hpp
@@ -36,7 +36,7 @@
// exception to be thrown if integer read from archive doesn't fit
// variable being loaded
class portable_binary_iarchive_exception :
- public virtual boost::archive::archive_exception
+ public boost::archive::archive_exception
{
public:
typedef enum {
diff --git a/example/portable_binary_oarchive.hpp b/example/portable_binary_oarchive.hpp
index 05c9f80b..5bf6ea45 100644
--- a/example/portable_binary_oarchive.hpp
+++ b/example/portable_binary_oarchive.hpp
@@ -34,7 +34,7 @@
// exception to be thrown if integer read from archive doesn't fit
// variable being loaded
class portable_binary_oarchive_exception :
- public virtual boost::archive::archive_exception
+ public boost::archive::archive_exception
{
public:
typedef enum {
diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp
index 50d326a7..d06303f6 100644
--- a/src/archive_exception.cpp
+++ b/src/archive_exception.cpp
@@ -13,7 +13,7 @@
#endif
#include
-#include
+//#include
#include
#define BOOST_ARCHIVE_SOURCE
@@ -22,6 +22,18 @@
namespace boost {
namespace archive {
+unsigned int
+archive_exception::append(unsigned int l, const char * a){
+ while(l < (sizeof(m_buffer) - 1)){
+ char c = *a++;
+ if('\0' == c)
+ break;
+ m_buffer[l++] = c;
+ }
+ m_buffer[l] = '\0';
+ return l;
+}
+
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
archive_exception::archive_exception(
exception_code c,
@@ -30,80 +42,81 @@ archive_exception::archive_exception(
) :
code(c)
{
- m_msg = "programming error";
+ unsigned int length = 0;
switch(code){
case no_exception:
- m_msg = "uninitialized exception";
+ length = append(length, "uninitialized exception");
break;
case unregistered_class:
- m_msg = "unregistered class";
+ length = append(length, "unregistered class");
if(NULL != e1){
- m_msg += " - ";
- m_msg += e1;
+ length = append(length, " - ");
+ length = append(length, e1);
}
break;
case invalid_signature:
- m_msg = "invalid signature";
+ length = append(length, "invalid signature");
break;
case unsupported_version:
- m_msg = "unsupported version";
+ length = append(length, "unsupported version");
break;
case pointer_conflict:
- m_msg = "pointer conflict";
+ length = append(length, "pointer conflict");
break;
case incompatible_native_format:
- m_msg = "incompatible native format";
+ length = append(length, "incompatible native format");
if(NULL != e1){
- m_msg += " - ";
- m_msg += e1;
+ length = append(length, " - ");
+ length = append(length, e1);
}
break;
case array_size_too_short:
- m_msg = "array size too short";
+ length = append(length, "array size too short");
break;
case input_stream_error:
- m_msg = "input stream error";
+ length = append(length, "input stream error");
break;
case invalid_class_name:
- m_msg = "class name too long";
+ length = append(length, "class name too long");
break;
case unregistered_cast:
- m_msg = "unregistered void cast ";
- m_msg += (NULL != e1) ? e1 : "?";
- m_msg += "<-";
- m_msg += (NULL != e2) ? e2 : "?";
+ length = append(length, "unregistered void cast ");
+ length = append(length, (NULL != e1) ? e1 : "?");
+ length = append(length, "<-");
+ length = append(length, (NULL != e2) ? e2 : "?");
break;
case unsupported_class_version:
- m_msg = "class version ";
- m_msg += (NULL != e1) ? e1 : "";
+ length = append(length, "class version ");
+ length = append(length, (NULL != e1) ? e1 : "");
break;
case other_exception:
// if get here - it indicates a derived exception
// was sliced by passing by value in catch
- m_msg = "unknown derived exception";
+ length = append(length, "unknown derived exception");
break;
case multiple_code_instantiation:
- m_msg = "code instantiated in more than one module";
+ length = append(length, "code instantiated in more than one module");
if(NULL != e1){
- m_msg += " - ";
- m_msg += e1;
+ length = append(length, " - ");
+ length = append(length, e1);
}
break;
case output_stream_error:
- m_msg = "output stream error";
+ length = append(length, "output stream error");
break;
default:
BOOST_ASSERT(false);
+ length = append(length, "programming error");
break;
}
}
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
-archive_exception::~archive_exception() throw () {}
+archive_exception::~archive_exception() throw() {}
BOOST_ARCHIVE_DECL(const char *)
archive_exception::what( ) const throw()
{
- return m_msg.c_str();
+ return m_buffer;
}
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
archive_exception::archive_exception() :
diff --git a/src/basic_archive.cpp b/src/basic_archive.cpp
index 23e57023..c2acf38e 100644
--- a/src/basic_archive.cpp
+++ b/src/basic_archive.cpp
@@ -70,10 +70,11 @@ BOOST_ARCHIVE_SIGNATURE(){
// 8 - Boost 1.44
// separated version_type into library_version_type and class_version_type
// changed version_type to be stored as 8 bits.
+// 10- fixed base64 output/input.
BOOST_ARCHIVE_DECL(library_version_type)
BOOST_ARCHIVE_VERSION(){
- return library_version_type(9);
+ return library_version_type(10);
}
} // namespace archive
diff --git a/src/xml_archive_exception.cpp b/src/xml_archive_exception.cpp
index ea78916a..d6289e0a 100644
--- a/src/xml_archive_exception.cpp
+++ b/src/xml_archive_exception.cpp
@@ -31,23 +31,24 @@ xml_archive_exception::xml_archive_exception(
) :
archive_exception(other_exception, e1, e2)
{
- m_msg = "programming error";
+ unsigned int length = 0;
switch(c){
case xml_archive_parsing_error:
- m_msg = "unrecognized XML syntax";
+ length = archive_exception::append(length, "unrecognized XML syntax");
break;
case xml_archive_tag_mismatch:
- m_msg = "XML start/end tag mismatch";
+ length = archive_exception::append(length, "XML start/end tag mismatch");
if(NULL != e1){
- m_msg += " - ";
- m_msg += e1;
+ length = archive_exception::append(length, " - ");
+ length = archive_exception::append(length, e1);
}
break;
case xml_archive_tag_name_error:
- m_msg = "Invalid XML tag name";
+ length = archive_exception::append(length, "Invalid XML tag name");
break;
default:
BOOST_ASSERT(false);
+ length = archive_exception::append(length, "programming error");
break;
}
}
diff --git a/test/test_binary.cpp b/test/test_binary.cpp
index a7a4aed0..70b559f8 100644
--- a/test/test_binary.cpp
+++ b/test/test_binary.cpp
@@ -70,16 +70,22 @@ int test_main( int /* argc */, char* /* argv */[] )
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;
+
+ std::memset(s1_1, '\0', sizeof(s1_1));
+ std::memset(s1_2, '\0', sizeof(s1_2));
+ std::memset(s1_3, '\0', sizeof(s1_3));
+ std::memset(s1_4, '\0', sizeof(s1_4));
{
test_ostream os(testfile, TEST_STREAM_FLAGS);
test_oarchive oa(os, TEST_ARCHIVE_FLAGS);
- boost::serialization::make_nvp(
+ oa << boost::serialization::make_nvp(
"s1",
boost::serialization::make_binary_object(
s1,
@@ -115,7 +121,7 @@ int test_main( int /* argc */, char* /* argv */[] )
{
test_istream is(testfile, TEST_STREAM_FLAGS);
test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
- boost::serialization::make_nvp(
+ ia >> boost::serialization::make_nvp(
"s1",
boost::serialization::make_binary_object(
s1_1,
@@ -148,8 +154,12 @@ int test_main( int /* argc */, char* /* argv */[] )
// failure of text mode binary.
ia >> BOOST_SERIALIZATION_NVP(i1);
}
- BOOST_CHECK(i == i1);
+ BOOST_CHECK(0 == std::strcmp(s1, s1_1));
+ BOOST_CHECK(0 == std::strcmp(s2, s1_2));
+ BOOST_CHECK(0 == std::strcmp(s3, s1_3));
+ BOOST_CHECK(0 == std::strcmp(s4, s1_4));
BOOST_CHECK(a == a1);
+ BOOST_CHECK(i == i1);
std::remove(testfile);
return EXIT_SUCCESS;
}
diff --git a/test/test_iterators.cpp b/test/test_iterators.cpp
index cc096dab..813f8d5e 100644
--- a/test/test_iterators.cpp
+++ b/test/test_iterators.cpp
@@ -102,9 +102,9 @@ template
void test_transform_width(unsigned int size){
// test transform_width
char rawdata[8];
-
+
char * rptr;
- for(rptr = rawdata + 6; rptr-- > rawdata;)
+ for(rptr = rawdata + size; rptr-- > rawdata;)
*rptr = static_cast(0xff & std::rand());
// convert 8 to 6 bit characters
@@ -112,32 +112,41 @@ void test_transform_width(unsigned int size){
char *, BitsOut, BitsIn
> translator1;
- std::vector v6;
+ std::vector vout;
std::copy(
translator1(BOOST_MAKE_PFTO_WRAPPER(static_cast(rawdata))),
translator1(BOOST_MAKE_PFTO_WRAPPER(rawdata + size)),
- std::back_inserter(v6)
+ std::back_inserter(vout)
);
// check to see we got the expected # of characters out
if(0 == size)
- BOOST_CHECK(v6.size() == 0);
+ BOOST_CHECK(vout.size() == 0);
else
- BOOST_CHECK(v6.size() == (size * BitsIn - 1 ) / BitsOut + 1);
+ BOOST_CHECK(vout.size() == (size * BitsIn - 1 ) / BitsOut + 1);
typedef boost::archive::iterators::transform_width<
std::vector::iterator, BitsIn, BitsOut
> translator2;
+ std::vector vin;
+ std::copy(
+ translator2(BOOST_MAKE_PFTO_WRAPPER(vout.begin())),
+ translator2(BOOST_MAKE_PFTO_WRAPPER(vout.end())),
+ std::back_inserter(vin)
+ );
+
+ // check to see we got the expected # of characters out
+ BOOST_CHECK(vin.size() == size);
+
BOOST_CHECK(
std::equal(
rawdata,
rawdata + size,
- translator2(BOOST_MAKE_PFTO_WRAPPER(v6.begin()))
+ vin.begin()
)
);
-
}
template
diff --git a/test/test_iterators_base64.cpp b/test/test_iterators_base64.cpp
index a3ebaa71..71cd70b8 100644
--- a/test/test_iterators_base64.cpp
+++ b/test/test_iterators_base64.cpp
@@ -37,12 +37,11 @@ namespace std{
#include
template
-void test_base64(){
+void test_base64(unsigned int size){
CharType rawdata[150];
- std::size_t size = sizeof(rawdata) / sizeof(CharType);
CharType * rptr;
for(rptr = rawdata + size; rptr-- > rawdata;)
- *rptr = static_cast(std::rand());
+ *rptr = static_cast(std::rand()& 0xff);
// convert to base64
typedef std::list text_base64_type;
@@ -57,7 +56,7 @@ void test_base64(){
,sizeof(CharType) * 8
>
>
- ,72
+ ,76
>
translate_out;
@@ -92,9 +91,17 @@ void test_base64(){
int
test_main( int /*argc*/, char* /*argv*/[] )
{
- test_base64();
+ test_base64(1);
+ test_base64(2);
+ test_base64(3);
+ test_base64(4);
+ test_base64(150);
#ifndef BOOST_NO_CWCHAR
- test_base64();
+ test_base64(1);
+ test_base64(2);
+ test_base64(3);
+ test_base64(4);
+ test_base64(150);
#endif
return EXIT_SUCCESS;
}
diff --git a/vc7ide/BoostSerializationLibrary.sln b/vc7ide/BoostSerializationLibrary.sln
index 0a83d0b2..ad08e095 100644
--- a/vc7ide/BoostSerializationLibrary.sln
+++ b/vc7ide/BoostSerializationLibrary.sln
@@ -79,16 +79,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "Manual.vcproj", "
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_array", "test_array.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll_polymorphic_derived2", "dll_polymorphic_derived2.vcproj", "{CED1BD64-563F-485D-AE69-668797013AA0}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_binary", "test_binary.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bitset", "test_bitset.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
@@ -185,6 +187,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_inclusion", "test_incl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "test_iterators.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators_base64", "test_iterators_base64.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
@@ -382,6 +386,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Serialization", "Serializat
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SerializationW", "SerializationW.vcproj", "{30E10563-960A-11D7-9FE9-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileSystem", "FileSystem.vcproj", "{30E10563-960A-11D7-9FE9-525400E2CF85}"
@@ -392,6 +397,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "System", "System.vcproj", "
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_array", "test_array.vcproj", "{DE4573AB-8C37-441D-8449-799C725500F5}"
+ ProjectSection(ProjectDependencies) = postProject
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
+ {30E10563-960A-11D7-9FE9-525400E2CF86} = {30E10563-960A-11D7-9FE9-525400E2CF86}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -1995,84 +2007,6 @@ Global
{15EA5B5E-D649-4C1C-80DD-B3CC7FA6658E}.Release runtime-static xml_archive.Build.0 = Release|Win32
{15EA5B5E-D649-4C1C-80DD-B3CC7FA6658E}.Release runtime-static xml_warchive.ActiveCfg = Release|Win32
{15EA5B5E-D649-4C1C-80DD-B3CC7FA6658E}.Release runtime-static xml_warchive.Build.0 = Release|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-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|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-dynamic|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|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-dynamic.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-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-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi binary_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi text_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static threading-multi xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_archive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Release runtime-static xml_warchive.Build.0 = Release runtime-dynamic|Win32
{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.ActiveCfg = Debug runtime-static|Win32
{CED1BD64-563F-485D-AE69-668797013AA0}.Debug.Build.0 = Debug runtime-static|Win32
{CED1BD64-563F-485D-AE69-668797013AA0}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
@@ -2151,8 +2085,8 @@ Global
{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_archive.Build.0 = Release runtime-dynamic|Win32
{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-dynamic|Win32
{CED1BD64-563F-485D-AE69-668797013AA0}.Release runtime-static xml_warchive.Build.0 = Release runtime-dynamic|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-static|Win32
- {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-static|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.ActiveCfg = Debug runtime-dynamic|Win32
+ {A7D4CC95-F2AC-11D6-9E47-525400E2CF85}.Debug.Build.0 = Debug runtime-dynamic|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
@@ -8079,6 +8013,84 @@ Global
{30E10563-960A-11D7-9FE9-525400E2CF86}.Release runtime-static xml_archive.Build.0 = Release runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF86}.Release runtime-static xml_warchive.ActiveCfg = Release runtime-static|Win32
{30E10563-960A-11D7-9FE9-525400E2CF86}.Release runtime-static xml_warchive.Build.0 = Release runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug.ActiveCfg = Debug runtime-dynamic|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug.Build.0 = Debug runtime-dynamic|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic.ActiveCfg = Debug runtime-dynamic|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic.Build.0 = Debug runtime-dynamic|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic threading-multi.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic threading-multi.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-dynamic xml_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Debug runtime-static xml_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-dynamic xml_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi binary_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi binary_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi text_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi text_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi text_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi text_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static threading-multi xml_warchive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static xml_archive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static xml_archive.Build.0 = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static xml_warchive.ActiveCfg = Debug runtime-static|Win32
+ {DE4573AB-8C37-441D-8449-799C725500F5}.Release runtime-static xml_warchive.Build.0 = Debug runtime-static|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/vc7ide/Serialization.vcproj b/vc7ide/Serialization.vcproj
index db6ca7e6..519c4fb6 100644
--- a/vc7ide/Serialization.vcproj
+++ b/vc7ide/Serialization.vcproj
@@ -44,7 +44,7 @@
Name="VCCustomBuildTool"/>
+ OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-gd-1_53.lib"/>
+ DebugInformationFormat="3"
+ CompileAs="0"/>
@@ -283,7 +284,7 @@
@@ -293,11 +294,11 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..""
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;BOOST_TEST_NO_AUTO_LINK=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="FALSE"
BasicRuntimeChecks="0"
SmallerTypeCheck="FALSE"
- RuntimeLibrary="5"
+ RuntimeLibrary="3"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
@@ -312,7 +313,7 @@
Name="VCCustomBuildTool"/>
+ OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-gd-1.53.lib"/>
+
+
diff --git a/vc7ide/test_array.vcproj b/vc7ide/test_array.vcproj
index 0fed8944..512d929d 100644
--- a/vc7ide/test_array.vcproj
+++ b/vc7ide/test_array.vcproj
@@ -3,8 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="test_array"
- ProjectGUID="{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
- RootNamespace="test_array"
+ ProjectGUID="{DE4573AB-8C37-441D-8449-799C725500F5}"
Keyword="Win32Proj">
+ ConfigurationType="1"
+ CharacterSet="0">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ OptimizeReferences="0"
+ EnableCOMDATFolding="0"
+ TargetMachine="0"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ DebugInformationFormat="1"
+ CompileAs="0"/>
+ Name="VCPostBuildEventTool"/>
+
+
-
-
-
diff --git a/vc7ide/test_binary.vcproj b/vc7ide/test_binary.vcproj
index 4172fc7b..e46c0371 100644
--- a/vc7ide/test_binary.vcproj
+++ b/vc7ide/test_binary.vcproj
@@ -79,7 +79,7 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=text_archive.hpp"
SmallerTypeCheck="TRUE"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
@@ -134,9 +134,9 @@
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ARCHIVE=text_archive.hpp"
SmallerTypeCheck="TRUE"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
EnableFunctionLevelLinking="FALSE"
TreatWChar_tAsBuiltInType="TRUE"
@@ -151,7 +151,6 @@