Full merge from trunk at revision 41356 of entire boost-root tree. Do Serialization separately to verify pre-commit check failures have been fixed.

[SVN r41368]
This commit is contained in:
Beman Dawes
2007-11-25 17:57:08 +00:00
parent e36c2be66f
commit 36694aec8f
193 changed files with 11665 additions and 12617 deletions

View File

@@ -18,14 +18,14 @@ namespace std{
}
#endif
#include <boost/serialization/base_object.hpp>
#include <boost/serialization/export.hpp>
#include <boost/archive/archive_exception.hpp>
#include "test_tools.hpp"
#include <boost/preprocessor/stringize.hpp>
#include BOOST_PP_STRINGIZE(BOOST_ARCHIVE_TEST)
#include <boost/serialization/base_object.hpp>
#include <boost/serialization/export.hpp>
class polymorphic_base
{
friend class boost::serialization::access;
@@ -51,6 +51,9 @@ public:
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)
class polymorphic_derived2 : public polymorphic_base
{
friend class boost::serialization::access;
@@ -64,6 +67,9 @@ public:
BOOST_CLASS_EXPORT(polymorphic_derived2)
// MWerks users can do this to make their code work
BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED(polymorphic_base, polymorphic_derived2)
// save exported polymorphic class
void save_exported(const char *testfile)
{