neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-05 17:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

NBT: create Tags using make_shared()

Browse source
This commit is contained in:
Matthias Schiffer 2018-07-21 16:29:02 +02:00
parent 59fe1ba025
commit 315bb38444
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/NBT/Tag.cpp
View file

@ -50,43 +50,43 @@ namespace NBT {
std::shared_ptr<const Tag> Tag::readTag(Type type, Buffer *buffer) { std::shared_ptr<const Tag> Tag::readTag(Type type, Buffer *buffer) {
switch (type) { switch (type) {
case Type::End: case Type::End:
return std::shared_ptr<EndTag>(new EndTag()); return std::make_shared<EndTag>();
case Type::Byte: case Type::Byte:
return std::shared_ptr<ByteTag>(new ByteTag(buffer)); return std::make_shared<ByteTag>(buffer);
case Type::Short: case Type::Short:
return std::shared_ptr<ShortTag>(new ShortTag(buffer)); return std::make_shared<ShortTag>(buffer);
case Type::Int: case Type::Int:
return std::shared_ptr<IntTag>(new IntTag(buffer)); return std::make_shared<IntTag>(buffer);
case Type::Long: case Type::Long:
return std::shared_ptr<LongTag>(new LongTag(buffer)); return std::make_shared<LongTag>(buffer);
case Type::Float: case Type::Float:
return std::shared_ptr<FloatTag>(new FloatTag(buffer)); return std::make_shared<FloatTag>(buffer);
case Type::Double: case Type::Double:
return std::shared_ptr<DoubleTag>(new DoubleTag(buffer)); return std::make_shared<DoubleTag>(buffer);
case Type::ByteArray: case Type::ByteArray:
return std::shared_ptr<ByteArrayTag>(new ByteArrayTag(buffer)); return std::make_shared<ByteArrayTag>(buffer);
case Type::String: case Type::String:
return std::shared_ptr<StringTag>(new StringTag(buffer)); return std::make_shared<StringTag>(buffer);
case Type::List: case Type::List:
return readList(buffer); return readList(buffer);
case Type::Compound: case Type::Compound:
return std::shared_ptr<CompoundTag>(new CompoundTag(buffer)); return std::make_shared<CompoundTag>(buffer);
case Type::IntArray: case Type::IntArray:
return std::shared_ptr<IntArrayTag>(new IntArrayTag(buffer)); return std::make_shared<IntArrayTag>(buffer);
case Type::LongArray: case Type::LongArray:
return std::shared_ptr<LongArrayTag>(new LongArrayTag(buffer)); return std::make_shared<LongArrayTag>(buffer);
default: default:
throw std::runtime_error("Tag::readTag: unknown tag type"); throw std::runtime_error("Tag::readTag: unknown tag type");
@ -98,43 +98,43 @@ std::shared_ptr<const Tag> Tag::readList(Buffer *buffer) {
switch (type) { switch (type) {
case Type::End: case Type::End:
return std::shared_ptr<Tag>(new ListTag<EndTag>(type, buffer)); return std::make_shared<ListTag<EndTag>>(type, buffer);
case Type::Byte: case Type::Byte:
return std::shared_ptr<Tag>(new ListTag<ByteTag>(type, buffer)); return std::make_shared<ListTag<ByteTag>>(type, buffer);
case Type::Short: case Type::Short:
return std::shared_ptr<Tag>(new ListTag<ShortTag>(type, buffer)); return std::make_shared<ListTag<ShortTag>>(type, buffer);
case Type::Int: case Type::Int:
return std::shared_ptr<Tag>(new ListTag<IntTag>(type, buffer)); return std::make_shared<ListTag<IntTag>>(type, buffer);
case Type::Long: case Type::Long:
return std::shared_ptr<Tag>(new ListTag<LongTag>(type, buffer)); return std::make_shared<ListTag<LongTag>>(type, buffer);
case Type::Float: case Type::Float:
return std::shared_ptr<Tag>(new ListTag<FloatTag>(type, buffer)); return std::make_shared<ListTag<FloatTag>>(type, buffer);
case Type::Double: case Type::Double:
return std::shared_ptr<Tag>(new ListTag<DoubleTag>(type, buffer)); return std::make_shared<ListTag<DoubleTag>>(type, buffer);
case Type::ByteArray: case Type::ByteArray:
return std::shared_ptr<Tag>(new ListTag<ByteArrayTag>(type, buffer)); return std::make_shared<ListTag<ByteArrayTag>>(type, buffer);
case Type::String: case Type::String:
return std::shared_ptr<Tag>(new ListTag<StringTag>(type, buffer)); return std::make_shared<ListTag<StringTag>>(type, buffer);
case Type::List: case Type::List:
return std::shared_ptr<Tag>(new ListTag<ListTagBase>(type, buffer)); return std::make_shared<ListTag<ListTagBase>>(type, buffer);
case Type::Compound: case Type::Compound:
return std::shared_ptr<Tag>(new ListTag<CompoundTag>(type, buffer)); return std::make_shared<ListTag<CompoundTag>>(type, buffer);
case Type::IntArray: case Type::IntArray:
return std::shared_ptr<Tag>(new ListTag<IntArrayTag>(type, buffer)); return std::make_shared<ListTag<IntArrayTag>>(type, buffer);
case Type::LongArray: case Type::LongArray:
return std::shared_ptr<Tag>(new ListTag<LongArrayTag>(type, buffer)); return std::make_shared<ListTag<LongArrayTag>>(type, buffer);
default: default:
throw std::runtime_error("Tag::readList: unknown tag type"); throw std::runtime_error("Tag::readList: unknown tag type");