diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 10:20:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 10:20:47 +0000 |
| commit | bb490edf4371d7a792a3fb4d7ac9dd0abed129f8 (patch) | |
| tree | 77ad2ba4eb0131f06adf0aa6d29b4b98f57942b8 /bridges/source/cpp_uno/gcc3_linux_ia64 | |
| parent | c6762e7b75a3bea150ebefa827679e485f01c9f7 (diff) | |
CWS-TOOLING: integrate CWS selinux01
2009-01-13 12:54:38 +0100 cmc r266213 : #i97320# might as well be silent if we fallback
2009-01-07 11:17:16 +0100 cmc r265957 : #i97320# use a double-mmap of an anonymous file under linux to keep onside of selinux
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_ia64')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 95dfdc0db67b..900560794513 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -575,7 +575,7 @@ namespace { const int codeSnippetSize = 40; -bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, +bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, bool bHasHiddenParam ) { #ifdef CMC_DEBUG @@ -598,7 +598,7 @@ bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, raw[2] = nOffsetAndIndex; raw[3] = destination->gp_value; - return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code); + return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff); } } @@ -628,7 +628,7 @@ bridges::cpp_uno::shared::VtableFactory::Slot* bridges::cpp_uno::shared::VtableF } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** in_slots, unsigned char * code, + Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { @@ -647,7 +647,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: *slots++ = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, ia64::return_in_hidden_param( reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( @@ -660,14 +660,14 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { - *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false); + *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false); code += codeSnippetSize; } break; case typelib_TypeClass_INTERFACE_METHOD: *slots++ = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, ia64::return_in_hidden_param( reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( |