[Libreoffice] [PATCH] Also use .NET2003 build fix for Clang (in toolkit)

[Kristian Rietveld]

This "fixes" the following error:

/source/libo/libo/toolkit/source/awt/vclxsplitter.cxx:114:32: error:
ambiguous conversion from derived class 'layoutimpl::VCLXSplitter' to 
base class 'cppu::OWeakObject':
    class layoutimpl::VCLXSplitter -> class VCLXWindow -> 
VCLXWindow_Base ->
class VCLXDevice -> ::cppu::OWeakObject
    class layoutimpl::VCLXSplitter -> class layoutimpl::Box_Base -> class
layoutimpl::Container -> Container_Base -> class cppu::OWeakObject
    class layoutimpl::VCLXSplitter -> class layoutimpl::Box_Base -> 
class layoutimpl::Container -> class layoutimpl::PropHelper -> 
cppu::OWeakObject
        aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
                               ^~~~~~~~~~~~~~~~~~~~~~~~~
By far the quickest is to use the already existing fix for .NET2003 for 
clang as well.  In the future, this is something that possibly should be 
avoided in the class hierarchy, there are more classes in the code base 
that expose a similar problem.


(Please keep me on CC as I am not subscribed to this list).

regards,

-kris.
>From d56e765df418097f5f2df9be60466a1ef012682f Mon Sep 17 00:00:00 2001
From: Kristian Rietveld <k...@lanedo.com>
Date: Sat, 22 Oct 2011 10:10:28 +0200
Subject: [PATCH 6/8] Also use .NET2003 build fix for Clang

---
 toolkit/source/awt/forward.hxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx
index ab39b40..efb22e7 100644
--- a/toolkit/source/awt/forward.hxx
+++ b/toolkit/source/awt/forward.hxx
@@ -64,12 +64,12 @@
         return aReturn; \
     }
 
-#if defined (_MSC_VER) && (_MSC_VER <= 1310)
+#if (defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__)
 // Windows .Net2003 build fix
 #define W3K_EXPLICIT_CAST(x) static_cast <XWindow2*> (&x)
-#else // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
+#else // !((defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__))
 #define W3K_EXPLICIT_CAST(x) x
-#endif // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
+#endif // !((defined (_MSC_VER) && (_MSC_VER <= 1310)) || defined (__clang__))
 
 #endif /* AWT_FORWARD_HXX */
 
-- 
1.7.4.4

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice