Imported Upstream version 1.51.0upstream/1.51.0

14 files changed, 56 insertions, 44 deletions

diff --git a/libs/serialization/doc/serialization.html b/libs/serialization/doc/serialization.html
index e60157ab30..15569a83b1 100644
--- a/libs/serialization/doc/serialization.html
+++ b/libs/serialization/doc/serialization.html
@@ -789,7 +789,7 @@ class derived : public base {
     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),
diff --git a/libs/serialization/src/codecvt_null.cpp b/libs/serialization/src/codecvt_null.cpp
index b6c06bdcd2..80ba2a3327 100644
--- a/libs/serialization/src/codecvt_null.cpp
+++ b/libs/serialization/src/codecvt_null.cpp
@@ -47,7 +47,7 @@ codecvt_null<wchar_t>::do_out(
 
 BOOST_WARCHIVE_DECL(std::codecvt_base::result)
 codecvt_null<wchar_t>::do_in(
-    std::mbstate_t & state,
+    std::mbstate_t & /*state*/,
     const char * first1, 
     const char * last1, 
     const char * & next1,
diff --git a/libs/serialization/src/utf8_codecvt_facet.cpp b/libs/serialization/src/utf8_codecvt_facet.cpp
index 1ee4eadd71..d064c63c39 100644
--- a/libs/serialization/src/utf8_codecvt_facet.cpp
+++ b/libs/serialization/src/utf8_codecvt_facet.cpp
@@ -12,7 +12,7 @@
      namespace boost { namespace archive { namespace detail {
 #define BOOST_UTF8_DECL
 #define BOOST_UTF8_END_NAMESPACE }}}
-#include "../../detail/utf8_codecvt_facet.cpp"
+#include <boost/detail/utf8_codecvt_facet.ipp>
 #undef BOOST_UTF8_END_NAMESPACE
 #undef BOOST_UTF8_DECL
 #undef BOOST_UTF8_BEGIN_NAMESPACE
diff --git a/libs/serialization/test/Jamfile.v2 b/libs/serialization/test/Jamfile.v2
index e5524d21ab..e335860d4d 100644
--- a/libs/serialization/test/Jamfile.v2
+++ b/libs/serialization/test/Jamfile.v2
@@ -31,7 +31,6 @@ lib dll_a_lib
         dll_a.cpp
         ../build//boost_serialization
     : 
-        <link>shared 
     ;
 
 lib dll_base_lib 
@@ -39,7 +38,6 @@ lib dll_base_lib
         dll_base.cpp
         ../build//boost_serialization
     : 
-        <link>shared 
     ;
     
 lib dll_derived2_lib
@@ -48,7 +46,6 @@ lib dll_derived2_lib
         dll_base_lib
         ../build//boost_serialization
     : 
-        <link>shared
     ;
 
 lib dll_polymorphic_derived2_lib
@@ -56,7 +53,6 @@ lib dll_polymorphic_derived2_lib
         polymorphic_derived2.cpp 
         ../build//boost_serialization
     : 
-        <link>shared
     ;
 
 test-suite "serialization" :
@@ -112,9 +108,12 @@ test-suite "serialization" :
 
 if ! $(BOOST_ARCHIVE_LIST) {
     test-suite "serialization2" : 
-        [ test-bsl-run test_dll_exported : : dll_polymorphic_derived2_lib : <runtime-link>shared ]
-        [ test-bsl-run test_dll_simple : : dll_a_lib : <runtime-link>shared ]
+        [ test-bsl-run test_dll_exported : : dll_polymorphic_derived2_lib ]
+        [ test-bsl-run test_dll_simple : : dll_a_lib ]
         [ compile test_dll_plugin.cpp ]
+        # Running the following test requires that the test know the directory 
+        # in which the dll is stored. I don't know how to extract this from bjam
+        # [ test-bsl-run test_dll_plugin : : dll_polymorphic_derived2_lib ]
         [ test-bsl-run test_private_ctor ]
         [ test-bsl-run test_reset_object_address : A ]
         [ test-bsl-run test_void_cast ]
diff --git a/libs/serialization/test/polymorphic_base.hpp b/libs/serialization/test/polymorphic_base.hpp
index b1493cfc34..da44a76d4e 100644
--- a/libs/serialization/test/polymorphic_base.hpp
+++ b/libs/serialization/test/polymorphic_base.hpp
@@ -22,7 +22,17 @@
 #include <boost/serialization/type_info_implementation.hpp>
 #include <boost/serialization/extended_type_info_no_rtti.hpp>
 
-class polymorphic_base
+#include "test_decl.hpp"
+
+#if defined(POLYMORPHIC_DERIVED_IMPORT)
+    #define DLL_DECL IMPORT_DECL
+#elif defined(POLYMORPHIC_DERIVED_EXPORT)
+    #define DLL_DECL EXPORT_DECL
+#else
+    #define DLL_DECL(x)
+#endif
+
+class DLL_DECL(BOOST_PP_EMPTY()) polymorphic_base
 {
     friend class boost::serialization::access;
     template<class Archive>
diff --git a/libs/serialization/test/polymorphic_derived2.hpp b/libs/serialization/test/polymorphic_derived2.hpp
index 47982e3935..0b5c002f2b 100644
--- a/libs/serialization/test/polymorphic_derived2.hpp
+++ b/libs/serialization/test/polymorphic_derived2.hpp
@@ -26,16 +26,6 @@
 
 #include "polymorphic_base.hpp"
 
-#include "test_decl.hpp"
-
-#if defined(POLYMORPHIC_DERIVED2_IMPORT)
-    #define DLL_DECL IMPORT_DECL
-#elif defined(POLYMORPHIC_DERIVED2_EXPORT)
-    #define DLL_DECL EXPORT_DECL
-#else
-    #define DLL_DECL(x)
-#endif
-
 class DLL_DECL(BOOST_PP_EMPTY()) polymorphic_derived2 : 
     public polymorphic_base
 {
diff --git a/libs/serialization/test/test_complex.cpp b/libs/serialization/test/test_complex.cpp
index 7182db1e0b..1621c84995 100644
--- a/libs/serialization/test/test_complex.cpp
+++ b/libs/serialization/test/test_complex.cpp
@@ -12,19 +12,25 @@
 
 #include <cstddef> // NULL
 #include <cstdlib> // rand
-#include <limits> 
+#include <cstdio> // remove
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+#include <boost/limits.hpp>
 
-#include <cstdio> // remove
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
+namespace std{
+    using ::rand; 
+    using ::fabs; 
     using ::remove;
-#ifndef UNDER_CE    
-    using ::numeric_limits;
-#endif
+    #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
+        using ::numeric_limits;
+    #endif
 }
 #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)
diff --git a/libs/serialization/test/test_cyclic_ptrs.cpp b/libs/serialization/test/test_cyclic_ptrs.cpp
index cecd0d1eb3..ade9079afb 100644
--- a/libs/serialization/test/test_cyclic_ptrs.cpp
+++ b/libs/serialization/test/test_cyclic_ptrs.cpp
@@ -19,7 +19,6 @@ namespace std{
 }
 #endif
 
-
 #include "test_tools.hpp"
 #include <boost/detail/no_exceptions_support.hpp>
 
diff --git a/libs/serialization/test/test_dll_exported.cpp b/libs/serialization/test/test_dll_exported.cpp
index 7b4c8e530f..41a2b2adb5 100644
--- a/libs/serialization/test/test_dll_exported.cpp
+++ b/libs/serialization/test/test_dll_exported.cpp
@@ -66,7 +66,7 @@ BOOST_CLASS_EXPORT(polymorphic_derived1)
 // MWerks users can do this to make their code work
 BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED(polymorphic_base, polymorphic_derived1)
 
-#define POLYMORPHIC_DERIVED2_IMPORT
+#define POLYMORPHIC_DERIVED_IMPORT
 #include "polymorphic_derived2.hpp"
 
 // save exported polymorphic class
diff --git a/libs/serialization/test/test_non_default_ctor.cpp b/libs/serialization/test/test_non_default_ctor.cpp
index 4c128a67ca..d94b67bc09 100644
--- a/libs/serialization/test/test_non_default_ctor.cpp
+++ b/libs/serialization/test/test_non_default_ctor.cpp
@@ -17,17 +17,18 @@
 #include <fstream>
 #include <cstdlib> // for rand()
 #include <cmath> // for fabs()
-#include <limits> 
-
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+#include <boost/limits.hpp>
+
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{
     using ::rand; 
     using ::fabs; 
     using ::remove;
-#ifndef UNDER_CE    
-    using ::numeric_limits;
-#endif
+    #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
+        using ::numeric_limits;
+    #endif
 }
 #endif
 
diff --git a/libs/serialization/test/test_non_intrusive.cpp b/libs/serialization/test/test_non_intrusive.cpp
index 250be63a74..ac5659954b 100644
--- a/libs/serialization/test/test_non_intrusive.cpp
+++ b/libs/serialization/test/test_non_intrusive.cpp
@@ -16,17 +16,18 @@
 #include <cstdlib> // for rand()
 #include <cstdio>  // remove
 #include <cmath>   // for fabs()
-#include <limits>
-
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+#include <boost/limits.hpp>
+
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{
-    using ::rand;
-    using ::fabs;
+    using ::rand; 
+    using ::fabs; 
     using ::remove;
-#ifndef UNDER_CE    
-    using ::numeric_limits; 
-#endif
+    #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
+        using ::numeric_limits;
+    #endif
 }
 #endif
 
diff --git a/libs/serialization/test/test_tools.hpp b/libs/serialization/test/test_tools.hpp
index 53ea6b8b2d..6fdbafbdef 100644
--- a/libs/serialization/test/test_tools.hpp
+++ b/libs/serialization/test/test_tools.hpp
@@ -157,7 +157,6 @@ namespace archive {
 #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 ) \
diff --git a/libs/serialization/vc7ide/BoostSerializationLibrary.sln b/libs/serialization/vc7ide/BoostSerializationLibrary.sln
index f5e1275076..0a83d0b253 100644
--- a/libs/serialization/vc7ide/BoostSerializationLibrary.sln
+++ b/libs/serialization/vc7ide/BoostSerializationLibrary.sln
@@ -189,6 +189,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "test_iter
 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}"
diff --git a/libs/serialization/vc7ide/Serialization.vcproj b/libs/serialization/vc7ide/Serialization.vcproj
index 9326ee0682..db6ca7e663 100644
--- a/libs/serialization/vc7ide/Serialization.vcproj
+++ b/libs/serialization/vc7ide/Serialization.vcproj
@@ -357,6 +357,9 @@
 				RelativePath="..\..\..\boost\serialization\shared_ptr_132.hpp">
 			</File>
 			<File
+				RelativePath="..\..\..\boost\archive\shared_ptr_helper.hpp">
+			</File>
+			<File
 				RelativePath="..\..\..\boost\serialization\slist.hpp">
 			</File>
 			<File
@@ -386,9 +389,6 @@
 				<File
 					RelativePath="..\..\..\boost\serialization\detail\shared_ptr_132.hpp">
 				</File>
-				<File
-					RelativePath="..\..\..\boost\archive\shared_ptr_helper.hpp">
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -744,6 +744,12 @@
 			</File>
 			<File
 				RelativePath="..\src\basic_iarchive.cpp">
+				<FileConfiguration
+					Name="Debug runtime-static|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\basic_iserializer.cpp">