Revert "GH-1232 attempt to fix reading NBT longs on OSX"

This reverts commit 877fc94f507785e6a982b5f7ad86490f9a7821bb.

2 files changed, 8 insertions, 14 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)...)));
 }
diff --git a/depends/libnbtplusplus/include/tag_primitive.h b/depends/libnbtplusplus/include/tag_primitive.h
index c83e695e..8b70c147 100644
--- a/depends/libnbtplusplus/include/tag_primitive.h
+++ b/depends/libnbtplusplus/include/tag_primitive.h
@@ -38,7 +38,7 @@ namespace nbt
  * Common class for tag_byte, tag_short, tag_int, tag_long, tag_float and tag_double.
  */
 template<class T>
-class NBT___EXPORT tag_primitive final : public detail::crtp_tag<tag_primitive<T>>
+class tag_primitive final : public detail::crtp_tag<tag_primitive<T>>
 {
 public:
     ///The type of the value
@@ -66,16 +66,10 @@ private:
     T value;
 };
 
-template<class T>
-NBT___EXPORT bool operator==(const tag_primitive<T>& lhs, const tag_primitive<T>& rhs)
-{
-	return lhs.get() == rhs.get();
-}
-template<class T>
-NBT___EXPORT bool operator!=(const tag_primitive<T>& lhs, const tag_primitive<T>& rhs)
-{
-	return !(lhs == rhs);
-}
+template<class T> bool operator==(const tag_primitive<T>& lhs, const tag_primitive<T>& rhs)
+{ return lhs.get() == rhs.get(); }
+template<class T> bool operator!=(const tag_primitive<T>& lhs, const tag_primitive<T>& rhs)
+{ return !(lhs == rhs); }
 
 //Typedefs that should be used instead of the template tag_primitive.
 typedef tag_primitive<int8_t> tag_byte;