diff options
Diffstat (limited to 'bridges/source/jni_uno/jni_base.h')
| -rw-r--r-- | bridges/source/jni_uno/jni_base.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 3de1898c758a..1d7d1fb2cb16 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -28,7 +28,6 @@ namespace std typedef __va_list va_list; } #endif -#include <memory> #include "jvmaccess/unovirtualmachine.hxx" #include "jvmaccess/virtualmachine.hxx" @@ -237,16 +236,16 @@ struct rtl_mem inline static void operator delete ( void *, void * ) {} - static inline ::std::auto_ptr< rtl_mem > allocate( ::std::size_t bytes ); + static inline rtl_mem * allocate( ::std::size_t bytes ); }; //______________________________________________________________________________ -inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes ) +inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); if (0 == p) throw BridgeRuntimeError( "out of memory!" ); - return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p ); + return (rtl_mem *)p; } |