/[packages]/cauldron/libreoffice/pristine/SOURCES/0001-fix-assert-call.patch
ViewVC logotype

Annotation of /cauldron/libreoffice/pristine/SOURCES/0001-fix-assert-call.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 812843 - (hide annotations) (download)
Sat Jan 31 00:54:33 2015 UTC (9 years, 1 month ago) by tv
Original Path: cauldron/libreoffice/current/SOURCES/0001-fix-assert-call.patch
File size: 1753 byte(s)
backport a cople fixes from FC
1 tv 812843 From df756ee1f2c37c8ed02bf8b357102e577c41901f Mon Sep 17 00:00:00 2001
2     From: David Tardon <dtardon@redhat.com>
3     Date: Thu, 29 Jan 2015 10:26:01 +0100
4     Subject: [PATCH] fix assert call
5    
6     Change-Id: I3b06c79b733cf4e97049a8a437680e1f8f339dac
7     ---
8     bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2 +-
9     bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 2 +-
10     2 files changed, 2 insertions(+), 2 deletions(-)
11    
12     diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
13     index 4922278..a21e43e 100644
14     --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
15     +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
16     @@ -360,7 +360,7 @@ static typelib_TypeClass cpp_mediate(
17    
18     // determine called method
19     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
20     - assert(nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!");
21     + assert(nMemberPos < pTypeDescr->nAllMembers); // illegal member index!
22    
23     TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
24    
25     diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
26     index c1815b4..1d95dee 100644
27     --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
28     +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx
29     @@ -289,7 +289,7 @@ static void cpp_call(
30     // return
31     typelib_TypeDescription * pReturnTypeDescr = 0;
32     TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
33     - assert(pReturnTypeDescr, "### expected return type description!");
34     + assert(pReturnTypeDescr); // ### expected return type description!
35    
36     void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
37    
38     --
39     2.1.0
40    

  ViewVC Help
Powered by ViewVC 1.1.30