[Boost-commit] svn:boost r46226 - trunk/libs/serialization/test

From: ramey_at_[hidden]
Date: 2008-06-07 19:49:24

Author: ramey
Date: 2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
New Revision: 46226
URL: http://svn.boost.org/trac/boost/changeset/46226

Log:
miscellaneous adjustments in to address trunk test failures
Text files modified: 
   trunk/libs/serialization/test/A.cpp                      |     2 +-                                      
   trunk/libs/serialization/test/A.hpp                      |     1 -                                       
   trunk/libs/serialization/test/base.hpp                   |     2 +-                                      
   trunk/libs/serialization/test/test_delete_pointer.cpp    |     9 ++-------                               
   trunk/libs/serialization/test/test_no_rtti.cpp           |     1 +                                       
   trunk/libs/serialization/test/test_non_default_ctor.cpp  |     2 +-                                      
   trunk/libs/serialization/test/test_non_default_ctor2.cpp |     7 +++++--                                 
   trunk/libs/serialization/test/test_static_warning.cpp    |     1 +                                       
   8 files changed, 12 insertions(+), 13 deletions(-)

Modified: trunk/libs/serialization/test/A.cpp
==============================================================================
--- trunk/libs/serialization/test/A.cpp	(original)
+++ trunk/libs/serialization/test/A.cpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -37,7 +37,7 @@
         unsigned int i = std::rand() % 27;
         if(0 == i)
             break;
-        x += static_cast<typename S::value_type>('a' - 1 + i);
+        x += static_cast<BOOST_DEDUCED_TYPENAME S::value_type>('a' - 1 + i);
     }
 }
 

Modified: trunk/libs/serialization/test/A.hpp
==============================================================================
--- trunk/libs/serialization/test/A.hpp	(original)
+++ trunk/libs/serialization/test/A.hpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -17,7 +17,6 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstddef> // size_t
-#include <string>
 #include <ostream> // for friend output operators
 
 #include <boost/config.hpp>

Modified: trunk/libs/serialization/test/base.hpp
==============================================================================
--- trunk/libs/serialization/test/base.hpp	(original)
+++ trunk/libs/serialization/test/base.hpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -17,7 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <boost/serialization/access.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#include <boost/serialization/assume_abstract.hpp>
 
 #ifndef DLL_DECL
 #define DLL_DECL

Modified: trunk/libs/serialization/test/test_delete_pointer.cpp
==============================================================================
--- trunk/libs/serialization/test/test_delete_pointer.cpp	(original)
+++ trunk/libs/serialization/test/test_delete_pointer.cpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -19,6 +19,7 @@
 
 #include "test_tools.hpp"
 #include <boost/detail/no_exceptions_support.hpp>
+#include <boost/throw_exception.hpp>
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/split_member.hpp>
@@ -38,13 +39,8 @@
     void load(Archive & ar, const unsigned int /* file_version */)
     {
         static int i = 0;
-        ++i;
-        bool b = false;
-        if(i == 2)
-            b = true;
-
         ar >> BOOST_SERIALIZATION_NVP(next_);
-        if(b)
+        if(++i == 3)
             boost::throw_exception(0);
     }
     BOOST_SERIALIZATION_SPLIT_MEMBER()
@@ -128,4 +124,3 @@
     return EXIT_SUCCESS;
 }
 
-

Modified: trunk/libs/serialization/test/test_no_rtti.cpp
==============================================================================
--- trunk/libs/serialization/test/test_no_rtti.cpp	(original)
+++ trunk/libs/serialization/test/test_no_rtti.cpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -50,6 +50,7 @@
 };
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(polymorphic_base)
+
 BOOST_CLASS_TYPE_INFO(
     polymorphic_base,
     extended_type_info_no_rtti<polymorphic_base>

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	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -123,7 +123,7 @@
 inline void save_construct_data(
     Archive & ar, 
     const A * a, 
-    const unsigned int /* file_version */
+    const BOOST_PFTO unsigned int /* file_version */
 ){
     // variable used for construction
     ar << boost::serialization::make_nvp("i", a->get_i());

Modified: trunk/libs/serialization/test/test_non_default_ctor2.cpp
==============================================================================
--- trunk/libs/serialization/test/test_non_default_ctor2.cpp	(original)
+++ trunk/libs/serialization/test/test_non_default_ctor2.cpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -96,8 +96,11 @@
 namespace serialization {
 
 template <class ArchiveT>
-void save_construct_data(ArchiveT& archive, const A* p, unsigned int version)
-{
+void save_construct_data(
+    ArchiveT& archive, 
+    const A* p, 
+    const BOOST_PFTO unsigned int version
+){
     archive & boost::serialization::make_nvp("initialValue", p->value);
 }
 

Modified: trunk/libs/serialization/test/test_static_warning.cpp
==============================================================================
--- trunk/libs/serialization/test/test_static_warning.cpp	(original)
+++ trunk/libs/serialization/test/test_static_warning.cpp	2008-06-07 19:49:23 EDT (Sat, 07 Jun 2008)
@@ -62,3 +62,4 @@
     BOOST_STATIC_WARNING(boost::is_polymorphic<non_polymorphic>::value); // Warn.
     return 0;
 }
+