From 691cea4b1a4aa1779c9ae88d88924e2fd3dcb6fd Mon Sep 17 00:00:00 2001 From: gazelleguardian Date: Mon, 6 Dec 2021 03:54:47 +0100 Subject: Fix building on windows with clang and msvc Signed-off-by: Philipp David --- include/io/stream_writer.h | 1 + include/tag_array.h | 5 ----- include/tag_list.h | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/io/stream_writer.h b/include/io/stream_writer.h index b10f03adfa..a69508f392 100644 --- a/include/io/stream_writer.h +++ b/include/io/stream_writer.h @@ -23,6 +23,7 @@ #include "tag.h" #include "endian_str.h" #include +#include namespace nbt { diff --git a/include/tag_array.h b/include/tag_array.h index 6e6a92bbeb..bed84d8070 100644 --- a/include/tag_array.h +++ b/include/tag_array.h @@ -126,11 +126,6 @@ typedef tag_array tag_byte_array; typedef tag_array tag_int_array; typedef tag_array tag_long_array; -//Explicit instantiations -template class NBT_EXPORT tag_array; -template class NBT_EXPORT tag_array; -template class NBT_EXPORT tag_array; - } #endif // TAG_ARRAY_H_INCLUDED diff --git a/include/tag_list.h b/include/tag_list.h index ecd7e89c11..e2c9b7bb7c 100644 --- a/include/tag_list.h +++ b/include/tag_list.h @@ -215,7 +215,7 @@ void tag_list::init(std::initializer_list init) el_type_ = T::type; tags.reserve(init.size()); for(const Arg& arg: init) - tags.emplace_back(make_unique(arg)); + tags.emplace_back(nbt::make_unique(arg)); } } -- cgit 0.0.5-2-1-g0f52