diff options
| -rw-r--r-- | include/crtp_tag.h | 9 | ||||
| -rw-r--r-- | include/make_unique.h | 37 | ||||
| -rw-r--r-- | test/nbttest.cpp | 2 |
3 files changed, 41 insertions, 7 deletions
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<class Sub> std::unique_ptr<tag> crtp_tag<Sub>::clone() const& { - return std::unique_ptr<tag>( - new Sub(static_cast<const Sub&>(*this)) - ); + return make_unique<Sub>(static_cast<const Sub&>(*this)); } template<class Sub> std::unique_ptr<tag> crtp_tag<Sub>::move_clone() && { - return std::unique_ptr<tag>( - new Sub(static_cast<Sub&&>(*this)) - ); + return make_unique<Sub>(static_cast<Sub&&>(*this)); } template<class Sub> 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 <http://www.gnu.org/licenses/>. + */ +#ifndef MAKE_UNIQUE_H_INCLUDED +#define MAKE_UNIQUE_H_INCLUDED + +#include <memory> + +namespace nbt +{ + +///Creates a new object of type T and returns a std::unique_ptr to it +template<class T, class... Args> +std::unique_ptr<T> make_unique(Args&&... args) +{ + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); +} + +} + +#endif // MAKE_UNIQUE_H_INCLUDED diff --git a/test/nbttest.cpp b/test/nbttest.cpp index 3e043f750b..3b72c102e5 100644 --- a/test/nbttest.cpp +++ b/test/nbttest.cpp @@ -163,7 +163,7 @@ void test_tag_compound() void test_value() { value val1; - value val2(std::unique_ptr<tag>(new tag_int(42))); + value val2(make_unique<tag_int>(42)); value val3(tag_int(42)); ASSERT(!val1 && val2 && val3); |