boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-01-28 07:32:10 +00:00
Code Issues Projects Releases Wiki Activity

small adjustments to accomodate various compilers

Browse Source 
[SVN r25067]
This commit is contained in:
Robert Ramey
2004-09-14 04:24:48 +00:00
parent bc6c704f69
commit 896906326f
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/serialization/base_object.hpp
View File

@@ -54,11 +54,12 @@ namespace detail {
}
};
static void invoke(){
mpl::eval_if<
typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
BOOST_DEDUCED_TYPENAME type_info_implementation<Base>::type::is_polymorphic,
mpl::identity<reg<Base, Derived> >,
mpl::identity<nothing>
>::type::invoke();
>::type typex;
typex::invoke();
}
};

43
include/boost/smart_cast.hpp
View File

@@ -82,7 +82,7 @@ namespace smart_cast_impl {
static T cast(U & u){
// if we're in debug mode
#if ! defined(NDEBUG) \
|| defined(__BORLANDC__) && (__BORLANDC__ <= 0x551) \
|| defined(__BORLANDC__) && (__BORLANDC__ <= 0x564) \
|| defined(__MWERKS__)
// do a checked dynamic cast
return cross::cast(u);
@@ -107,6 +107,7 @@ namespace smart_cast_impl {
mpl::identity<cross>,
mpl::identity<linear>
>::type typex;
// typex works around gcc 2.95 issue
return typex::cast(u);
#endif
}
@@ -120,11 +121,20 @@ namespace smart_cast_impl {
};
template<class U>
static T cast(U & u){
return mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type::cast(u);
#if defined(__BORLANDC__)
return mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type::cast(u);
#else
typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type typex;
return typex::cast(u);
#endif
}
};
@@ -154,7 +164,7 @@ namespace smart_cast_impl {
template<class U>
static T cast(U * u){
// if we're in debug mode
#if ! defined(NDEBUG) || defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
#if ! defined(NDEBUG) || defined(__BORLANDC__) && (__BORLANDC__ <= 0x564)
// do a checked dynamic cast
return cross::cast(u);
#else
@@ -193,11 +203,20 @@ namespace smart_cast_impl {
template<class U>
static T cast(U * u){
return mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type::cast(u);
#if defined(__BORLANDC__)
return BOOST_DEDUCED_TYPENAME mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type::cast(u);
#else
typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
boost::is_polymorphic<U>,
mpl::identity<polymorphic>,
mpl::identity<non_polymorphic>
>::type typex;
return typex::cast(u);
#endif
}
};

7
include/boost/state_saver.hpp
View File

@@ -77,11 +77,12 @@ public:
{}
~state_saver() {
mpl::eval_if<
::boost::has_nothrow_copy<T>,
typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
has_nothrow_copy<T>,
mpl::identity<restore>,
mpl::identity<restore_with_exception>
>::type::invoke(previous_ref, previous_value);
>::type typex;
typex::invoke(previous_ref, previous_value);
}
}; // state_saver<>