Kaydet (Commit) e9e134dc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

No use using auto_ptr here (spares us a -Werror,-Wdeprecated-declarations)

Change-Id: I5aa9d90d5871e33bf8c76c1ebcaa39c18614294d
üst f182354c
...@@ -28,7 +28,6 @@ namespace std ...@@ -28,7 +28,6 @@ namespace std
typedef __va_list va_list; typedef __va_list va_list;
} }
#endif #endif
#include <memory>
#include "jvmaccess/unovirtualmachine.hxx" #include "jvmaccess/unovirtualmachine.hxx"
#include "jvmaccess/virtualmachine.hxx" #include "jvmaccess/virtualmachine.hxx"
...@@ -237,16 +236,16 @@ struct rtl_mem ...@@ -237,16 +236,16 @@ struct rtl_mem
inline static void operator delete ( void *, void * ) 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 ); void * p = rtl_allocateMemory( bytes );
if (0 == p) if (0 == p)
throw BridgeRuntimeError( "out of memory!" ); throw BridgeRuntimeError( "out of memory!" );
return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p ); return (rtl_mem *)p;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment