diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-09-10 00:41:12 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-09-10 00:41:12 +0200 |
commit | bd96a25f7af2a06cafecf51b16784032dd3302d3 (patch) | |
tree | 56f45bfe3d74932dbaab4ff8c89da21544bcb10f /depends/libnbtplusplus/include/tag_compound.h | |
parent | 877fc94f507785e6a982b5f7ad86490f9a7821bb (diff) | |
download | MultiMC-bd96a25f7af2a06cafecf51b16784032dd3302d3.tar MultiMC-bd96a25f7af2a06cafecf51b16784032dd3302d3.tar.gz MultiMC-bd96a25f7af2a06cafecf51b16784032dd3302d3.tar.lz MultiMC-bd96a25f7af2a06cafecf51b16784032dd3302d3.tar.xz MultiMC-bd96a25f7af2a06cafecf51b16784032dd3302d3.zip |
Revert "GH-1232 attempt to fix reading NBT longs on OSX"
This reverts commit 877fc94f507785e6a982b5f7ad86490f9a7821bb.
Diffstat (limited to 'depends/libnbtplusplus/include/tag_compound.h')
-rw-r--r-- | depends/libnbtplusplus/include/tag_compound.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/libnbtplusplus/include/tag_compound.h b/depends/libnbtplusplus/include/tag_compound.h index 66fe18b4..5ec818a3 100644 --- a/depends/libnbtplusplus/include/tag_compound.h +++ b/depends/libnbtplusplus/include/tag_compound.h @@ -124,9 +124,9 @@ public: void read_payload(io::stream_reader& reader) override; void write_payload(io::stream_writer& writer) const override; - NBT___EXPORT friend bool operator==(const tag_compound& lhs, const tag_compound& rhs) + friend bool operator==(const tag_compound& lhs, const tag_compound& rhs) { return lhs.tags == rhs.tags; } - NBT___EXPORT friend bool operator!=(const tag_compound& lhs, const tag_compound& rhs) + friend bool operator!=(const tag_compound& lhs, const tag_compound& rhs) { return !(lhs == rhs); } private: @@ -134,7 +134,7 @@ private: }; template<class T, class... Args> -NBT___EXPORT std::pair<tag_compound::iterator, bool> tag_compound::emplace(const std::string& key, Args&&... args) +std::pair<tag_compound::iterator, bool> tag_compound::emplace(const std::string& key, Args&&... args) { return put(key, value(make_unique<T>(std::forward<Args>(args)...))); } |