summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorljfa-ag <ljfa-ag@web.de>2015-08-11 14:47:00 +0200
committerljfa-ag <ljfa-ag@web.de>2015-08-11 14:47:00 +0200
commit7c320c9c058d6f7e151860a29cb35b136011e955 (patch)
tree5b3cf304bd8f44959e98c3b45b0e733a84b56d93
parenta830cf0ef509ad0b0145df4f0a01f4905e360eb7 (diff)
downloadProject-Tick-7c320c9c058d6f7e151860a29cb35b136011e955.tar.gz
Project-Tick-7c320c9c058d6f7e151860a29cb35b136011e955.zip
Add overload for value_initializer with nullptr
-rw-r--r--include/value_initializer.h1
-rw-r--r--src/value_initializer.cpp1
-rw-r--r--test/nbttest.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/include/value_initializer.h b/include/value_initializer.h
index 42cf77da77..b8f6c8b7c9 100644
--- a/include/value_initializer.h
+++ b/include/value_initializer.h
@@ -47,6 +47,7 @@ public:
value_initializer(std::unique_ptr<tag>&& t) noexcept;
value_initializer(value&& val) noexcept;
value_initializer(tag&& t);
+ value_initializer(nullptr_t);
value_initializer(int8_t val);
value_initializer(int16_t val);
diff --git a/src/value_initializer.cpp b/src/value_initializer.cpp
index 18a4f58d96..91bbde6cfb 100644
--- a/src/value_initializer.cpp
+++ b/src/value_initializer.cpp
@@ -26,6 +26,7 @@ namespace nbt
value_initializer::value_initializer(std::unique_ptr<tag>&& t) noexcept: value(std::move(t)) {}
value_initializer::value_initializer(value&& val) noexcept : value(std::move(val)) {}
value_initializer::value_initializer(tag&& t) : value(std::move(t)) {}
+value_initializer::value_initializer(nullptr_t) : value(nullptr) {}
value_initializer::value_initializer(int8_t val) : value(tag_byte(val)) {}
value_initializer::value_initializer(int16_t val) : value(tag_short(val)) {}
diff --git a/test/nbttest.cpp b/test/nbttest.cpp
index fd74995d67..7430a02770 100644
--- a/test/nbttest.cpp
+++ b/test/nbttest.cpp
@@ -284,6 +284,7 @@ void test_value()
val1 = val1;
val2 = val2;
ASSERT(!val1);
+ ASSERT(val1 == value_initializer(nullptr));
ASSERT(val2 == tag_int(21));
val3 = tag_short(2);