summaryrefslogtreecommitdiffstats
path: root/depends/libnbtplusplus
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-06 23:46:38 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-06 23:46:38 +0200
commitb8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7 (patch)
treef462a0abdbce52a120d816cf60f0b9d00c4cab1a /depends/libnbtplusplus
parent38693e1d6ca7f05d9488348ddf298488d1cc0995 (diff)
downloadMultiMC-b8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7.tar
MultiMC-b8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7.tar.gz
MultiMC-b8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7.tar.lz
MultiMC-b8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7.tar.xz
MultiMC-b8cdcdb96b4267e5dd9f4df2728df3a1dfb9ecf7.zip
GH-1047 build fixes
Diffstat (limited to 'depends/libnbtplusplus')
-rw-r--r--depends/libnbtplusplus/include/endian_str.h4
-rw-r--r--depends/libnbtplusplus/include/text/json_formatter.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/depends/libnbtplusplus/include/endian_str.h b/depends/libnbtplusplus/include/endian_str.h
index ac8e8986..4a3151c3 100644
--- a/depends/libnbtplusplus/include/endian_str.h
+++ b/depends/libnbtplusplus/include/endian_str.h
@@ -91,7 +91,7 @@ NBT___EXPORT void write_big(std::ostream& os, float x);
NBT___EXPORT void write_big(std::ostream& os, double x);
template<class T>
-NBT___EXPORT void read(std::istream& is, T& x, endian e)
+void read(std::istream& is, T& x, endian e)
{
if(e == little)
read_little(is, x);
@@ -100,7 +100,7 @@ NBT___EXPORT void read(std::istream& is, T& x, endian e)
}
template<class T>
-NBT___EXPORT void write(std::ostream& os, T x, endian e)
+void write(std::ostream& os, T x, endian e)
{
if(e == little)
write_little(os, x);
diff --git a/depends/libnbtplusplus/include/text/json_formatter.h b/depends/libnbtplusplus/include/text/json_formatter.h
index 1762e910..ec653731 100644
--- a/depends/libnbtplusplus/include/text/json_formatter.h
+++ b/depends/libnbtplusplus/include/text/json_formatter.h
@@ -38,6 +38,7 @@ namespace text
class NBT___EXPORT json_formatter
{
public:
+ json_formatter() {};
void print(std::ostream& os, const tag& t) const;
};