Revert Borland specific fix for non-Borland compilers as it breaks some of them :-(

[SVN r52057]
This commit is contained in:
John Maddock
2009-03-30 16:06:39 +00:00
parent b253d45376
commit da752aaaa9

View File

@ -36,6 +36,7 @@ struct is_virtual_base_of_impl
template<typename Base, typename Derived>
struct is_virtual_base_of_impl<Base, Derived, mpl::true_>
{
#ifdef __BORLANDC__
struct X : public virtual Derived, public virtual Base
{
X();
@ -50,6 +51,22 @@ struct is_virtual_base_of_impl<Base, Derived, mpl::true_>
Y& operator=(const Y&);
~Y();
};
#else
struct X : Derived, virtual Base
{
X();
X(const X&);
X& operator=(const X&);
~X();
};
struct Y : Derived
{
Y();
Y(const Y&);
Y& operator=(const Y&);
~Y();
};
#endif
BOOST_STATIC_CONSTANT(bool, value = (sizeof(X)==sizeof(Y)));
};