Subject: [Boost-commit] svn:boost r77575 - in branches/release/libs/serialization: . example src test vc7ide
From: ramey_at_[hidden]
Date: 2012-03-26 18:34:18
Author: ramey
Date: 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
New Revision: 77575
URL: http://svn.boost.org/trac/boost/changeset/77575
Log:
Merged trunk 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/test/test_complex.cpp | 6 +++---
branches/release/libs/serialization/test/test_cyclic_ptrs.cpp | 1 -
branches/release/libs/serialization/test/test_non_default_ctor.cpp | 3 +--
branches/release/libs/serialization/test/test_non_intrusive.cpp | 3 +--
branches/release/libs/serialization/test/test_tools.hpp | 1 -
branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln | 1 +
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 -
9 files changed, 8 insertions(+), 12 deletions(-)
Modified: branches/release/libs/serialization/test/test_complex.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_complex.cpp (original)
+++ branches/release/libs/serialization/test/test_complex.cpp 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -12,9 +12,6 @@
#include <cstddef> // NULL
#include <cstdlib> // rand
-#include <limits>
-#include <boost/config.hpp>
-
#include <cstdio> // remove
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
@@ -25,6 +22,9 @@
}
#endif
+#include <boost/config.hpp>
+#include <boost/limits.hpp>
+
#include "test_tools.hpp"
#include <boost/preprocessor/stringize.hpp>
#include BOOST_PP_STRINGIZE(BOOST_ARCHIVE_TEST)
Modified: branches/release/libs/serialization/test/test_cyclic_ptrs.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_cyclic_ptrs.cpp (original)
+++ branches/release/libs/serialization/test/test_cyclic_ptrs.cpp 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -19,7 +19,6 @@
}
#endif
-
#include "test_tools.hpp"
#include <boost/detail/no_exceptions_support.hpp>
Modified: branches/release/libs/serialization/test/test_non_default_ctor.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_non_default_ctor.cpp (original)
+++ branches/release/libs/serialization/test/test_non_default_ctor.cpp 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -17,9 +17,8 @@
#include <fstream>
#include <cstdlib> // for rand()
#include <cmath> // for fabs()
-#include <limits>
-
#include <boost/config.hpp>
+#include <boost/limits.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::rand;
Modified: branches/release/libs/serialization/test/test_non_intrusive.cpp
==============================================================================
--- branches/release/libs/serialization/test/test_non_intrusive.cpp (original)
+++ branches/release/libs/serialization/test/test_non_intrusive.cpp 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -16,9 +16,8 @@
#include <cstdlib> // for rand()
#include <cstdio> // remove
#include <cmath> // for fabs()
-#include <limits>
-
#include <boost/config.hpp>
+#include <boost/limits.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::rand;
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 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -157,7 +157,6 @@
#endif // defined(__hpux)
#endif // defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-//#include <boost/test/test_tools.hpp>
#include <boost/detail/lightweight_test.hpp>
#define BOOST_CHECK( P ) \
Modified: branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln
==============================================================================
--- branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln (original)
+++ branches/release/libs/serialization/vc7ide/BoostSerializationLibrary.sln 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -189,6 +189,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators_base64", "test_iterators_base64.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
ProjectSection(ProjectDependencies) = postProject
+ {30E10563-960A-11D7-9FE9-525400E2CF85} = {30E10563-960A-11D7-9FE9-525400E2CF85}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_list", "test_list.vcproj", "{A7D4CC95-F2AC-11D6-9E47-525400E2CF85}"
Modified: branches/release/libs/serialization/vc7ide/Serialization.vcproj
==============================================================================
--- branches/release/libs/serialization/vc7ide/Serialization.vcproj (original)
+++ branches/release/libs/serialization/vc7ide/Serialization.vcproj 2012-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -155,7 +155,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="'$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_47.lib""/>
+ OutputFile="$(ConfigurationName)\libboost_serialization-vc71-mt-sgd-1_48.lib"/>
<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-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -312,7 +312,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1.45.lib"/>
+ OutputFile="$(ConfigurationName)\libboost_wserialization-vc71-mt-sgd-1.48.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-03-26 18:34:17 EDT (Mon, 26 Mar 2012)
@@ -151,7 +151,6 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="TRUE"
- AdditionalDependencies="Library"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(ConfigurationName)"