[Boost-commit] svn:boost r52057 - trunk/boost/type_traits

Subject: [Boost-commit] svn:boost r52057 - trunk/boost/type_traits
From: john_at_[hidden]
Date: 2009-03-30 12:06:41

Author: johnmaddock
Date: 2009-03-30 12:06:39 EDT (Mon, 30 Mar 2009)
New Revision: 52057
URL: http://svn.boost.org/trac/boost/changeset/52057

Log:
Revert Borland specific fix for non-Borland compilers as it breaks some of them :-(
Text files modified: 
   trunk/boost/type_traits/is_virtual_base_of.hpp |    17 +++++++++++++++++                       
   1 files changed, 17 insertions(+), 0 deletions(-)

Modified: trunk/boost/type_traits/is_virtual_base_of.hpp
==============================================================================
--- trunk/boost/type_traits/is_virtual_base_of.hpp	(original)
+++ trunk/boost/type_traits/is_virtual_base_of.hpp	2009-03-30 12:06:39 EDT (Mon, 30 Mar 2009)
@@ -36,6 +36,7 @@
 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 @@
        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)));
 };