diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
| commit | 9703cc63cea3c47d13afe5f9b0eb22c631000958 (patch) | |
| tree | 65456e93a12de0f7f7303f7de7f72f683142b5e0 /tools | |
| parent | b39a778b5efa73936893a91b3223bb350bae1fb2 (diff) | |
Remove o3tl/heap_ptr.hxx, use std::unique_ptr instead
Change-Id: Iac70c9be13892a36bfb5975f62e5345b88d4f144
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/pch/precompiled_tl.hxx | 1 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/inc/pch/precompiled_tl.hxx b/tools/inc/pch/precompiled_tl.hxx index 2101b0c35527..c74b9b81b6fc 100644 --- a/tools/inc/pch/precompiled_tl.hxx +++ b/tools/inc/pch/precompiled_tl.hxx @@ -49,7 +49,6 @@ #include <list> #include <math.h> #include <new> -#include <o3tl/heap_ptr.hxx> #include <osl/diagnose.h> #include <osl/endian.h> #include <osl/file.hxx> diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 91fffad7bc71..7e248a297643 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <boost/checked_delete.hpp> -#include <o3tl/heap_ptr.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <tools/inetmime.hxx> @@ -39,6 +38,7 @@ #include <algorithm> #include <limits> +#include <memory> #include <string.h> @@ -586,10 +586,10 @@ void INetURLObject::setInvalid() namespace { SvMemoryStream * memoryStream(void const * data, sal_Int32 length) { - o3tl::heap_ptr<char, boost::checked_array_deleter<char> > b( + std::unique_ptr<char, boost::checked_array_deleter<char> > b( new char[length]); memcpy(b.get(), data, length); - o3tl::heap_ptr<SvMemoryStream> s( + std::unique_ptr<SvMemoryStream> s( new SvMemoryStream(b.get(), length, STREAM_READ)); s->ObjectOwnsMemory(true); b.release(); |