diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:23:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:23:21 +0000 |
| commit | 944f6fea167841ecb3e167c9202245a6f7174eb7 (patch) | |
| tree | 0ceb3fa4d90f10a4c330cd64417cba88377acfe9 /cppu | |
| parent | c5ebe21f2a360eb053f19914f57510952a0c02d6 (diff) | |
INTEGRATION: CWS unomacli64 (1.2.2); FILE MERGED
2007/06/05 15:09:13 kr 1.2.2.1: #i77422# Use va_list * instead of plain type; added missing include for precompiled headers
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/test/EnvStack_tester/EnvStack.tester.cxx | 8 | ||||
| -rw-r--r-- | cppu/test/EnvStack_tester/ProbeEnv.cxx | 19 |
2 files changed, 15 insertions, 12 deletions
diff --git a/cppu/test/EnvStack_tester/EnvStack.tester.cxx b/cppu/test/EnvStack_tester/EnvStack.tester.cxx index 53e3bd1116ce..c572f6716eba 100644 --- a/cppu/test/EnvStack_tester/EnvStack.tester.cxx +++ b/cppu/test/EnvStack_tester/EnvStack.tester.cxx @@ -4,9 +4,9 @@ * * $RCSfile: EnvStack.tester.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2007-05-09 13:41:59 $ + * last change: $Author: obo $ $Date: 2007-07-18 12:23:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,9 +61,9 @@ static rtl::OUString s_getCurrentEnvDcp(void) return env_dcp; } -extern "C" { static void s_getCurrentEnvDcp_v(va_list param) +extern "C" { static void s_getCurrentEnvDcp_v(va_list * pParam) { - rtl_uString ** ppEnvDcp = va_arg(param, rtl_uString **); + rtl_uString ** ppEnvDcp = va_arg(*pParam, rtl_uString **); rtl::OUString env_dcp(s_getCurrentEnvDcp()); diff --git a/cppu/test/EnvStack_tester/ProbeEnv.cxx b/cppu/test/EnvStack_tester/ProbeEnv.cxx index ac0890aa2708..077a985fe100 100644 --- a/cppu/test/EnvStack_tester/ProbeEnv.cxx +++ b/cppu/test/EnvStack_tester/ProbeEnv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ProbeEnv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2007-05-09 13:42:24 $ + * last change: $Author: obo $ $Date: 2007-07-18 12:23:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cppu.hxx" + #include "cppu/EnvDcp.hxx" #include "cppu/helper/purpenv/Environment.hxx" @@ -65,8 +68,8 @@ protected: virtual void v_enter(void); virtual void v_leave(void); - virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list param); - virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list param); + virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam); + virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam); virtual int v_isValid (rtl::OUString * pReason); }; @@ -98,24 +101,24 @@ static void s_checkGEnvValidity(void) } } -void TestEnv::v_callInto_v(uno_EnvCallee * pCallee, va_list param) +void TestEnv::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) { g_commentStack += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-into")); g_commentStack += cppu::EnvDcp::getPurpose(m_pEnv->pTypeName); s_checkGEnvValidity(); - pCallee(param); + pCallee(pParam); } -void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list param) +void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { g_commentStack += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-out")); g_commentStack += cppu::EnvDcp::getPurpose(m_pEnv->pTypeName); s_checkGEnvValidity(); - pCallee(param); + pCallee(pParam); } void TestEnv::v_enter(void) |