summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/io/stream_writer.h1
-rw-r--r--include/tag_array.h5
-rw-r--r--include/tag_list.h2
3 files changed, 2 insertions, 6 deletions
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 <iosfwd>
+#include <string>
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<int8_t> tag_byte_array;
typedef tag_array<int32_t> tag_int_array;
typedef tag_array<int64_t> tag_long_array;
-//Explicit instantiations
-template class NBT_EXPORT tag_array<int8_t>;
-template class NBT_EXPORT tag_array<int32_t>;
-template class NBT_EXPORT tag_array<int64_t>;
-
}
#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<Arg> init)
el_type_ = T::type;
tags.reserve(init.size());
for(const Arg& arg: init)
- tags.emplace_back(make_unique<T>(arg));
+ tags.emplace_back(nbt::make_unique<T>(arg));
}
}