diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 14:00:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 14:00:28 +0000 |
| commit | ab607f6be277f1dcd36314525fbf389b572d869e (patch) | |
| tree | 0686651fc286ae106de77875d951fbae9f2c5cb6 /stoc/source/javavm | |
| parent | ae9d19605829999c2d8ca884b9fb3720755c57d4 (diff) | |
INTEGRATION: CWS intptr (1.68.22); FILE MERGED
2005/09/13 14:50:33 kendy 1.68.22.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
Diffstat (limited to 'stoc/source/javavm')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 5364655a8cd0..943862be4559 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: javavm.cxx,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: hr $ $Date: 2005-09-26 13:27:10 $ + * last change: $Author: kz $ $Date: 2005-10-05 15:00:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1003,13 +1003,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) " that the requested JavaVM pointer is not available")), static_cast< cppu::OWeakObject * >(this)); } - if (sizeof (m_pJavaVm) <= sizeof (sal_Int32)) { - return css::uno::makeAny(reinterpret_cast< sal_Int32 >(m_pJavaVm)); - } else { - OSL_ASSERT( - sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); - return css::uno::makeAny(reinterpret_cast< sal_Int64 >(m_pJavaVm)); - } + return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm)); case RETURN_VIRTUALMACHINE: OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *)); return css::uno::makeAny( |