[Libreoffice-commits] core.git: bridges/source
root
root at fedora1.s390.bos.redhat.com
Sat Jun 15 22:53:14 PDT 2013
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit e17ab68dbdc7cae8488b39407908d2d218011a2f
Author: root <root at fedora1.s390.bos.redhat.com>
Date: Fri Jun 14 04:21:18 2013 -0400
fix debug build on s390
... by removing obsolete OSL_ENSURE. nVtableCall was renamed to
nFunctionIndex and the same check is done a couple of lines above.
Change-Id: Id52b69adceb337049c50a599aefc718498d688c0
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 5e97cdd..2240df0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -354,7 +354,6 @@ static typelib_TypeClass cpp_mediate(
}
// determine called method
- OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" );
More information about the Libreoffice-commits
mailing list