[Boost-commit] svn:boost r79951 - in trunk/libs/serialization: src test vc7ide

Subject: [Boost-commit] svn:boost r79951 - in trunk/libs/serialization: src test vc7ide
From: ramey_at_[hidden]
Date: 2012-08-09 21:39:55

Author: ramey
Date: 2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
New Revision: 79951
URL: http://svn.boost.org/trac/boost/changeset/79951

Log:
adjustment for QNX
altered Jamfiles to fix test with DLLS on static builds
Text files modified: 
   trunk/libs/serialization/src/codecvt_null.cpp           |     2 +-                                      
   trunk/libs/serialization/test/Jamfile.v2                |    15 +++++++++------                         
   trunk/libs/serialization/test/polymorphic_base.hpp      |    12 +++++++++++-                            
   trunk/libs/serialization/test/polymorphic_derived2.hpp  |    10 ----------                              
   trunk/libs/serialization/test/test_complex.cpp          |    13 +++++++++----                           
   trunk/libs/serialization/test/test_dll_exported.cpp     |     2 +-                                      
   trunk/libs/serialization/test/test_non_default_ctor.cpp |     9 +++++----                               
   trunk/libs/serialization/test/test_non_intrusive.cpp    |    11 ++++++-----                             
   trunk/libs/serialization/vc7ide/Serialization.vcproj    |    12 +++++++++---                            
   9 files changed, 51 insertions(+), 35 deletions(-)

Modified: trunk/libs/serialization/src/codecvt_null.cpp
==============================================================================
--- trunk/libs/serialization/src/codecvt_null.cpp	(original)
+++ trunk/libs/serialization/src/codecvt_null.cpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -47,7 +47,7 @@
 
 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,

Modified: trunk/libs/serialization/test/Jamfile.v2
==============================================================================
--- trunk/libs/serialization/test/Jamfile.v2	(original)
+++ trunk/libs/serialization/test/Jamfile.v2	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -31,7 +31,7 @@
         dll_a.cpp
         ../build//boost_serialization
     : 
-        <link>shared 
+        # <link>shared 
     ;
 
 lib dll_base_lib 
@@ -39,7 +39,7 @@
         dll_base.cpp
         ../build//boost_serialization
     : 
-        <link>shared 
+        # <link>shared 
     ;
     
 lib dll_derived2_lib
@@ -48,7 +48,7 @@
         dll_base_lib
         ../build//boost_serialization
     : 
-        <link>shared
+        # <link>shared
     ;
 
 lib dll_polymorphic_derived2_lib
@@ -56,7 +56,7 @@
         polymorphic_derived2.cpp 
         ../build//boost_serialization
     : 
-        <link>shared
+        # <link>shared
     ;
 
 test-suite "serialization" :
@@ -112,9 +112,12 @@
 
 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 ]

Modified: trunk/libs/serialization/test/polymorphic_base.hpp
==============================================================================
--- trunk/libs/serialization/test/polymorphic_base.hpp	(original)
+++ trunk/libs/serialization/test/polymorphic_base.hpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -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>

Modified: trunk/libs/serialization/test/polymorphic_derived2.hpp
==============================================================================
--- trunk/libs/serialization/test/polymorphic_derived2.hpp	(original)
+++ trunk/libs/serialization/test/polymorphic_derived2.hpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -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
 {

Modified: trunk/libs/serialization/test/test_complex.cpp
==============================================================================
--- trunk/libs/serialization/test/test_complex.cpp	(original)
+++ trunk/libs/serialization/test/test_complex.cpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -13,12 +13,17 @@
 #include <cstddef> // NULL
 #include <cstdlib> // rand
 #include <cstdio> // remove
+#include <boost/config.hpp>
+#include <boost/limits.hpp>
+
 #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
 

Modified: trunk/libs/serialization/test/test_dll_exported.cpp
==============================================================================
--- trunk/libs/serialization/test/test_dll_exported.cpp	(original)
+++ trunk/libs/serialization/test/test_dll_exported.cpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -66,7 +66,7 @@
 // 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

Modified: trunk/libs/serialization/test/test_non_default_ctor.cpp
==============================================================================
--- trunk/libs/serialization/test/test_non_default_ctor.cpp	(original)
+++ trunk/libs/serialization/test/test_non_default_ctor.cpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -18,15 +18,16 @@
 #include <cstdlib> // for rand()
 #include <cmath> // for fabs()
 #include <boost/config.hpp>
-#include <boost/limits.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
 

Modified: trunk/libs/serialization/test/test_non_intrusive.cpp
==============================================================================
--- trunk/libs/serialization/test/test_non_intrusive.cpp	(original)
+++ trunk/libs/serialization/test/test_non_intrusive.cpp	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -18,14 +18,15 @@
 #include <cmath>   // for fabs()
 #include <boost/config.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
 

Modified: trunk/libs/serialization/vc7ide/Serialization.vcproj
==============================================================================
--- trunk/libs/serialization/vc7ide/Serialization.vcproj	(original)
+++ trunk/libs/serialization/vc7ide/Serialization.vcproj	2012-08-09 21:39:53 EDT (Thu, 09 Aug 2012)
@@ -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">