You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.7 KiB
41 lines
1.7 KiB
10 years ago
|
From df756ee1f2c37c8ed02bf8b357102e577c41901f Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Tardon <dtardon@redhat.com>
|
||
|
|
Date: Thu, 29 Jan 2015 10:26:01 +0100
|
||
|
|
Subject: [PATCH] fix assert call
|
||
|
|
|
||
|
|
Change-Id: I3b06c79b733cf4e97049a8a437680e1f8f339dac
|
||
|
|
---
|
||
|
|
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2 +-
|
||
|
|
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
|
||
|
|
index 4922278..a21e43e 100644
|
||
|
|
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
|
||
|
|
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
|
||
|
|
@@ -360,7 +360,7 @@ static typelib_TypeClass cpp_mediate(
|
||
|
|
|
||
|
|
// determine called method
|
||
|
|
sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
|
||
|
|
- assert(nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!");
|
||
|
|
+ assert(nMemberPos < pTypeDescr->nAllMembers); // illegal member index!
|
||
|
|
|
||
|
|
TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
|
||
|
|
|
||
|
|
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
|
||
|
|
index c1815b4..1d95dee 100644
|
||
|
|
--- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
|
||
|
|
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
|
||
|
|
@@ -289,7 +289,7 @@ static void cpp_call(
|
||
|
|
// return
|
||
|
|
typelib_TypeDescription * pReturnTypeDescr = 0;
|
||
|
|
TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
|
||
|
|
- assert(pReturnTypeDescr, "### expected return type description!");
|
||
|
|
+ assert(pReturnTypeDescr); // ### expected return type description!
|
||
|
|
|
||
|
|
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|