diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:16:30 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-07-01 11:16:30 +0000 |
commit | bbc25f6ea0aeed50c7145bfa34e6281c645a6cc2 (patch) | |
tree | 70cca6ce14307324c589c155a503eccdd2641a23 /bridges/source/cpp_uno/cc50_solaris_sparc | |
parent | 3f163dada88fce61106f4247f8f664b01ab83c6a (diff) |
INTEGRATION: CWS sb34 (1.2.70); FILE MERGED
2005/06/28 15:23:51 sb 1.2.70.1: #b6280765# Adapted Solaris C++--UNO bridge code to be compliant with libCrun (problems with ex_alloc/ex_throw usage, and pointers within RTTI structures).
Diffstat (limited to 'bridges/source/cpp_uno/cc50_solaris_sparc')
-rw-r--r-- | bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx index c5bd7cd19869..de86adc4f3c7 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cc50_solaris_sparc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cc50_solaris_sparc.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-05-19 13:09:50 $ + * last change: $Author: kz $ $Date: 2005-07-01 12:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +#include <cstddef> + #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> #endif @@ -72,7 +74,7 @@ namespace __Crun { struct static_type_info { - char* m_pClassName; + std::ptrdiff_t m_pClassName; int m_nSkip1; // must be 0 void* m_pMagic; // points to some magic data int m_nMagic[ 4 ]; @@ -116,7 +118,6 @@ void cc50_solaris_sparc_raiseException( void cc50_solaris_sparc_fillUnoException( void*, const char*, - typelib_TypeDescription * pExcTypeDescr, uno_Any*, uno_Mapping * pCpp2Uno ); } |