diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 52e5b7cf1a2b..e96217495ddb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -27,7 +27,7 @@ ************************************************************************/ #include <malloc.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> @@ -65,7 +65,7 @@ namespace void ** startovrflw = ovrflw; int nregs = 0; //number of words passed in registers -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp2uno_call\n"); #endif // return @@ -81,14 +81,14 @@ namespace { if (hppa::isRegisterReturn(pReturnTypeRef)) { -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif pUnoReturn = pRegisterReturn; // direct way for simple types } else { -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex return via r8\n"); #endif pCppReturn = (void *)r8; @@ -295,14 +295,14 @@ namespace uno_Any aUnoExc; // Any will be constructed by callee uno_Any * pUnoExc = &aUnoExc; -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before dispatch\n"); #endif // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after dispatch\n"); #endif @@ -384,7 +384,7 @@ namespace { void ** ovrflw = (void**)(sp); -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp_mediate with\n"); fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset); fprintf(stderr, "and %x %x\n", (long)(ovrflw[0]), (long)(ovrflw[-1])); @@ -407,14 +407,14 @@ namespace { nFunctionIndex &= 0x7fffffff; pThis = gpreg[1]; -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[1]\n"); #endif } else { pThis = gpreg[0]; -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[0]\n"); #endif } @@ -578,7 +578,7 @@ sal_Int64 cpp_vtable_call( sal_uInt32 in0, sal_uInt32 in1, sal_uInt32 in2, sal_u register double d3 asm("fr7"); dpreg[3] = d3; -#ifdef CMC_DEBUG +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "got to cpp_vtable_call with %x %x\n", functionIndex, vtableOffset); for (int i = 0; i < hppa::MAX_GPR_REGS; ++i) fprintf(stderr, "reg %d is %d %x\n", i, gpreg[i], gpreg[i]); |