Subject: [Boost-commit] svn:boost r56833 - trunk/boost/serialization
From: ramey_at_[hidden]
Date: 2009-10-14 12:36:05
Author: ramey
Date: 2009-10-14 12:36:04 EDT (Wed, 14 Oct 2009)
New Revision: 56833
URL: http://svn.boost.org/trac/boost/changeset/56833
Log:
Fix problem with multiple declaration of void_cast_register
Text files modified:
trunk/boost/serialization/void_cast.hpp | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
Modified: trunk/boost/serialization/void_cast.hpp
==============================================================================
--- trunk/boost/serialization/void_cast.hpp (original)
+++ trunk/boost/serialization/void_cast.hpp 2009-10-14 12:36:04 EDT (Wed, 14 Oct 2009)
@@ -27,6 +27,7 @@
#include <boost/serialization/type_info_implementation.hpp>
#include <boost/serialization/extended_type_info.hpp>
#include <boost/type_traits/is_virtual_base_of.hpp>
+#include <boost/serialization/void_cast_fwd.hpp>
#include <boost/config/abi_prefix.hpp> // must be the last header
@@ -243,17 +244,6 @@
} // void_cast_detail
-// Register a base/derived pair. This indicates that it is possible
-// to upcast a void pointer from Derived to Base and downcast a
-// void pointer from Base to Derived. Note bogus arguments to workaround
-// bug in msvc 6.0
-template<class Derived, class Base>
-BOOST_DLLEXPORT
-inline const void_cast_detail::void_caster & void_cast_register(
- const Derived * dnull = NULL,
- const Base * bnull = NULL
-) BOOST_USED;
-
template<class Derived, class Base>
BOOST_DLLEXPORT
inline const void_cast_detail::void_caster & void_cast_register(