diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-30 16:51:38 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:49:27 +0200 |
commit | e9e134dc214088230206a4f8f46e53b686ae6a7f (patch) | |
tree | b6b5c2f770f18784d6f1c4e55ebc33aa8b154b24 /bridges | |
parent | f182354cc58e87ae30cdd583c573382707129ce5 (diff) |
No use using auto_ptr here (spares us a -Werror,-Wdeprecated-declarations)
Change-Id: I5aa9d90d5871e33bf8c76c1ebcaa39c18614294d
Diffstat (limited to 'bridges')
-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; } |