[Libreoffice-commits] core.git: cppu/source

[Stephan Bergmann]

 cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 6b5dce35f2ff2d7c52e51686b438f9037f9cb78f
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Tue Jul 29 16:45:33 2014 +0200

    s_mapInterface must match uno_MapInterfaceFunc
    
    Change-Id: I5035db31ce3cb3d07dca86aa77552274c02f695a

diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx 
b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 9375dd7..bb29e13 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -73,13 +73,15 @@ public:
 
 static void SAL_CALL s_mapInterface(
     uno_Mapping                       * puno_Mapping,
-    uno_Interface                    ** ppOut,
-    uno_Interface                     * pUnoI,
+    void                             ** ppOut,
+    void                              * pUnoI,
     typelib_InterfaceTypeDescription  * pTypeDescr )
     SAL_THROW_EXTERN_C()
 {
     Mapping * pMapping = static_cast<Mapping *>(puno_Mapping);
-    pMapping->mapInterface(ppOut, pUnoI, pTypeDescr);
+    pMapping->mapInterface(
+        reinterpret_cast<uno_Interface **>(ppOut),
+        static_cast<uno_Interface *>(pUnoI), pTypeDescr);
 }
 
 extern "C" {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits