diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-01-26 14:12:21 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-01-26 17:51:29 +0100 |
commit | bde86f8074842585e2964b3157e97672fb25e63d (patch) | |
tree | a6d93942677d9d8e374761449ddeac838e73cd1a /include/o3tl | |
parent | vcl: actually that shared_array was a scam (diff) | |
download | core-bde86f8074842585e2964b3157e97672fb25e63d.tar.gz core-bde86f8074842585e2964b3157e97672fb25e63d.zip |
vcl: replace boost::shared_array with std::shared_ptr
Add o3tl::make_shared_array() to create the shared_ptr with the right
deleter.
The main difference then is that shared_array has operator[], but this
code didn't even use it.
Change-Id: I500ffc2f92b99c2a3924c0cdcdaa101956b69add
Diffstat (limited to 'include/o3tl')
-rw-r--r-- | include/o3tl/make_shared.hxx | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/include/o3tl/make_shared.hxx b/include/o3tl/make_shared.hxx new file mode 100644 index 000000000000..d42783c301fa --- /dev/null +++ b/include/o3tl/make_shared.hxx @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_O3TL_MAKE_SHARED_HXX +#define INCLUDED_O3TL_MAKE_SHARED_HXX + +#include <memory> +#include <type_traits> + +namespace o3tl { + +/** Allocate an array stored in a shared_ptr, calling operator delete[]. + Note that this is only allowed for arithmetic types because shared_ptr + implicitly converts to sub-types. + */ +template<typename T> +std::shared_ptr<T> make_shared_array(size_t const size) +{ + static_assert(std::is_arithmetic<T>::value, "only arrays of arithmetic types allowed"); + return std::shared_ptr<T>(new T[size], std::default_delete<T[]>()); +} + +} // namespace o3tl + +#endif // INCLUDED_O3TL_MAKE_SHARED_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |