From da752aaaa983de11ff68d058b0cc8e4233b68f3c Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 30 Mar 2009 16:06:39 +0000
Subject: [PATCH] Revert Borland specific fix for non-Borland compilers as it
 breaks some of them :-(

[SVN r52057]
---
 .../boost/type_traits/is_virtual_base_of.hpp    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/boost/type_traits/is_virtual_base_of.hpp b/include/boost/type_traits/is_virtual_base_of.hpp
index 5dc93c4..e3dd441 100644
--- a/include/boost/type_traits/is_virtual_base_of.hpp
+++ b/include/boost/type_traits/is_virtual_base_of.hpp
@@ -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)));
 };