mirror of
https://github.com/neocturne/MinedMap.git
synced 2025-04-20 19:35:08 +02:00
Remove UniqueCPtr in favor of std::unique_ptr.
std::make_unique should be available as well.
This commit is contained in:
parent
3160b59cdd
commit
61a8bd4a26
3 changed files with 6 additions and 23 deletions
|
@ -1,18 +0,0 @@
|
||||||
// SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
/*
|
|
||||||
Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
|
|
||||||
All rights reserved.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
|
|
||||||
template<typename T> class UniqueCPtr : public std::unique_ptr<T, void (*)(void *)> {
|
|
||||||
public:
|
|
||||||
UniqueCPtr() : std::unique_ptr<T, void (*)(void *)>(nullptr, std::free) {}
|
|
||||||
template<typename T2> UniqueCPtr(T2 ptr) : std::unique_ptr<T, void (*)(void *)>(ptr, std::free) {}
|
|
||||||
};
|
|
|
@ -7,9 +7,10 @@
|
||||||
|
|
||||||
#include "ChunkData.hpp"
|
#include "ChunkData.hpp"
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <iostream>
|
||||||
|
#include <memory>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
|
@ -62,7 +63,7 @@ void ChunkData::inflateChunk(Buffer buffer) {
|
||||||
inflateEnd(&stream);
|
inflateEnd(&stream);
|
||||||
|
|
||||||
len = stream.total_out;
|
len = stream.total_out;
|
||||||
data = UniqueCPtr<uint8_t[]>(output);
|
data = std::unique_ptr<uint8_t[]>(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChunkData::parseChunk() {
|
void ChunkData::parseChunk() {
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
|
|
||||||
#include "../Buffer.hpp"
|
#include "../Buffer.hpp"
|
||||||
#include "../UniqueCPtr.hpp"
|
|
||||||
#include "../Util.hpp"
|
#include "../Util.hpp"
|
||||||
#include "../NBT/CompoundTag.hpp"
|
#include "../NBT/CompoundTag.hpp"
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
|
||||||
namespace MinedMap {
|
namespace MinedMap {
|
||||||
|
@ -22,7 +22,7 @@ namespace World {
|
||||||
class ChunkData {
|
class ChunkData {
|
||||||
private:
|
private:
|
||||||
size_t len;
|
size_t len;
|
||||||
UniqueCPtr<uint8_t[]> data;
|
std::unique_ptr<uint8_t[]> data;
|
||||||
|
|
||||||
std::shared_ptr<const NBT::CompoundTag> root;
|
std::shared_ptr<const NBT::CompoundTag> root;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue