diff --git a/src/UniqueCPtr.hpp b/src/UniqueCPtr.hpp deleted file mode 100644 index 647f7e1..0000000 --- a/src/UniqueCPtr.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: BSD-2-Clause -/* - Copyright (c) 2015, Matthias Schiffer - All rights reserved. -*/ - - -#pragma once - -#include -#include - - -template class UniqueCPtr : public std::unique_ptr { -public: - UniqueCPtr() : std::unique_ptr(nullptr, std::free) {} - template UniqueCPtr(T2 ptr) : std::unique_ptr(ptr, std::free) {} -}; diff --git a/src/World/ChunkData.cpp b/src/World/ChunkData.cpp index 972ee5e..ac3101d 100644 --- a/src/World/ChunkData.cpp +++ b/src/World/ChunkData.cpp @@ -7,9 +7,10 @@ #include "ChunkData.hpp" -#include -#include #include +#include +#include +#include #include @@ -62,7 +63,7 @@ void ChunkData::inflateChunk(Buffer buffer) { inflateEnd(&stream); len = stream.total_out; - data = UniqueCPtr(output); + data = std::unique_ptr(output); } void ChunkData::parseChunk() { diff --git a/src/World/ChunkData.hpp b/src/World/ChunkData.hpp index 62a69c1..7479453 100644 --- a/src/World/ChunkData.hpp +++ b/src/World/ChunkData.hpp @@ -9,11 +9,11 @@ #include "../Buffer.hpp" -#include "../UniqueCPtr.hpp" #include "../Util.hpp" #include "../NBT/CompoundTag.hpp" #include +#include namespace MinedMap { @@ -22,7 +22,7 @@ namespace World { class ChunkData { private: size_t len; - UniqueCPtr data; + std::unique_ptr data; std::shared_ptr root;