From 0ba8b7b427ab0e64a1634897e9a9ce35999b6e53 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 19 Jun 2006 22:44:42 +0000
Subject: INTEGRATION: CWS warnings01 (1.2.36); FILE MERGED 2006/01/25 20:20:48
sb 1.2.36.3: RESYNC: (1.3-1.4); FILE MERGED 2005/09/22 18:25:18 sb 1.2.36.2:
RESYNC: (1.2-1.3); FILE MERGED 2005/09/09 12:37:39 sb 1.2.36.1: #i53898# Made
code warning-free.
---
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'bridges/source/cpp_uno/gcc3_solaris_sparc')
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index 0d3881ea3..48ed34b63 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2006-01-16 13:23:45 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:44:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -470,11 +470,13 @@ static void cpp_call(
}
}
+}
-//==================================================================================================
-void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
+namespace bridges { namespace cpp_uno { namespace shared {
+
+void unoInterfaceProxyDispatch(
uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
+ void * pReturn, void * pArgs[], uno_Any ** ppException )
{
#if defined BRIDGES_DEBUG
OString cstr( OUStringToOString( pMemberDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
@@ -597,4 +599,4 @@ void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
}
}
-}
+} } }
--
cgit v1.2.3