[Boost-commit] svn:boost r79540 - in branches/release/libs/serialization: . doc example src test vc7ide

Subject: [Boost-commit] svn:boost r79540 - in branches/release/libs/serialization: . doc example src test vc7ide
From: ramey_at_[hidden]
Date: 2012-07-15 13:21:51

Author: ramey
Date: 2012-07-15 13:21:50 EDT (Sun, 15 Jul 2012)
New Revision: 79540
URL: http://svn.boost.org/trac/boost/changeset/79540

Log:
merge to release
Properties modified: 
   branches/release/libs/serialization/   (props changed)
   branches/release/libs/serialization/example/   (props changed)
   branches/release/libs/serialization/src/   (props changed)
   branches/release/libs/serialization/test/test_diamond_complex.cpp   (props changed)
Text files modified: 
   branches/release/libs/serialization/doc/serialization.html              |     2 +-                                      
   branches/release/libs/serialization/vc7ide/Serialization.vcproj         |     2 +-                                      
   branches/release/libs/serialization/vc7ide/SerializationW.vcproj        |     2 +-                                      
   branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj |     1 +                                       
   4 files changed, 4 insertions(+), 3 deletions(-)

Modified: branches/release/libs/serialization/doc/serialization.html
==============================================================================
--- branches/release/libs/serialization/doc/serialization.html	(original)
+++ branches/release/libs/serialization/doc/serialization.html	2012-07-15 13:21:50 EDT (Sun, 15 Jul 2012)
@@ -789,7 +789,7 @@
     template<class Archive>
     void serialize(Archive & ar, const unsigned int file_version){
         // method 1 : invoke base class serialization
-        boost::serialization::base_object<base>(*this);
+        ar & boost::serialization::base_object<base>(*this);
         // method 2 : explicitly register base/derived relationship
         boost::serialization::void_cast_register<derived, base>(
             static_cast<derived *>=NULL),

Modified: branches/release/libs/serialization/vc7ide/Serialization.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/Serialization.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/Serialization.vcproj	2012-07-15 13:21:50 EDT (Sun, 15 Jul 2012)
@@ -155,7 +155,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_48.lib"/>
+				OutputFile="&apos;$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_47.lib&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/SerializationW.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/SerializationW.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/SerializationW.vcproj	2012-07-15 13:21:50 EDT (Sun, 15 Jul 2012)
@@ -312,7 +312,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLibrarianTool"
-				OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1.48.lib"/>
+				OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1.45.lib"/>
                         <Tool
                                 Name="VCMIDLTool"/>
                         <Tool

Modified: branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj	(original)
+++ branches/release/libs/serialization/vc7ide/test_iterators_base64.vcproj	2012-07-15 13:21:50 EDT (Sun, 15 Jul 2012)
@@ -151,6 +151,7 @@
                         <Tool
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
+				AdditionalDependencies="Library"
                                 LinkIncremental="2"
                                 SuppressStartupBanner="TRUE"
                                 AdditionalLibraryDirectories="$(ConfigurationName)"