From 9eb00e57addf80fd0c8aca7d573b3075d26602cd Mon Sep 17 00:00:00 2001 From: ljfa-ag Date: Wed, 15 Jul 2015 16:44:59 +0200 Subject: Create make_unique function --- include/crtp_tag.h | 9 +++------ include/make_unique.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 include/make_unique.h (limited to 'include') diff --git a/include/crtp_tag.h b/include/crtp_tag.h index 8611038ffa..f227fec9cf 100644 --- a/include/crtp_tag.h +++ b/include/crtp_tag.h @@ -21,6 +21,7 @@ #define CRTP_TAG_H_INCLUDED #include "tag.h" +#include "make_unique.h" namespace nbt { @@ -58,17 +59,13 @@ namespace detail template std::unique_ptr crtp_tag::clone() const& { - return std::unique_ptr( - new Sub(static_cast(*this)) - ); + return make_unique(static_cast(*this)); } template std::unique_ptr crtp_tag::move_clone() && { - return std::unique_ptr( - new Sub(static_cast(*this)) - ); + return make_unique(static_cast(*this)); } template diff --git a/include/make_unique.h b/include/make_unique.h new file mode 100644 index 0000000000..9a929543cc --- /dev/null +++ b/include/make_unique.h @@ -0,0 +1,37 @@ +/* + * libnbt++ - A library for the Minecraft Named Binary Tag format. + * Copyright (C) 2013, 2015 ljfa-ag + * + * This file is part of libnbt++. + * + * libnbt++ is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * libnbt++ is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with libnbt++. If not, see . + */ +#ifndef MAKE_UNIQUE_H_INCLUDED +#define MAKE_UNIQUE_H_INCLUDED + +#include + +namespace nbt +{ + +///Creates a new object of type T and returns a std::unique_ptr to it +template +std::unique_ptr make_unique(Args&&... args) +{ + return std::unique_ptr(new T(std::forward(args)...)); +} + +} + +#endif // MAKE_UNIQUE_H_INCLUDED -- cgit 0.0.5-2-1-g0f52