[openoffice] branch trunk updated: With no more double_map, we don't use this anymore

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 68d376d  With no more double_map, we don't use this anymore
68d376d is described below

commit 68d376d60a42704c3c45a6e3b740bf58eccaacff
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Wed Dec 2 09:20:30 2020 -0500

    With no more double_map, we don't use this anymore
    
    (cherry picked from commit 831244c90862133a6a76a79eea7d3510cad1ba45)
---
 main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
index 4f6319d..69b2fc8 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
@@ -510,10 +510,11 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 //==================================================================================================
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+	Slot ** slots, unsigned char * code, /*sal_PtrDiff writetoexecdiff,*/
 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
 	sal_Int32 functionCount, sal_Int32 nVtableOffset )
 {
+	const sal_PtrDiff writetoexecdiff = 0;
 	(*slots) -= functionCount;
 	Slot * s = *slots;
 	for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )