diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-03-22 21:58:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 21:58:31 +0100 |
| commit | 5bbeb216d27f60bb8063e9ab01f7ea6976a2e0b4 (patch) | |
| tree | 676c2216dbddcfa40b11c362523225704c2bf627 /include | |
| parent | dc72a20b7efd304d12af2025223fad07b4b78464 (diff) | |
| parent | b156bcaa4acf0a5b392bbed60bd274c39e2398d4 (diff) | |
| download | Project-Tick-5bbeb216d27f60bb8063e9ab01f7ea6976a2e0b4.tar.gz Project-Tick-5bbeb216d27f60bb8063e9ab01f7ea6976a2e0b4.zip | |
Merge pull request #2 from oynqr/build/lto
Fix building with LTO
Diffstat (limited to 'include')
| -rw-r--r-- | include/io/stream_writer.h | 1 | ||||
| -rw-r--r-- | include/tag_array.h | 5 | ||||
| -rw-r--r-- | include/tag_list.h | 2 |
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)); } } |