Make value_initializer inherit from value

2 files changed, 13 insertions, 18 deletions

diff --git a/src/tag_compound.cpp b/src/tag_compound.cpp
index 4ee38c4412..78a5c46fc6 100644
--- a/src/tag_compound.cpp
+++ b/src/tag_compound.cpp
@@ -25,7 +25,7 @@ namespace nbt
 tag_compound::tag_compound(std::initializer_list<std::pair<std::string, value_initializer>> init)
 {
     for(const auto& pair: init)
-        tags.emplace(std::move(pair.first), std::move(pair.second.get()));
+        tags.emplace(std::move(pair.first), std::move(pair.second));
 }
 
 value& tag_compound::at(const std::string& key)
diff --git a/src/value_initializer.cpp b/src/value_initializer.cpp
index 3de74da717..4b039e441a 100644
--- a/src/value_initializer.cpp
+++ b/src/value_initializer.cpp
@@ -23,23 +23,18 @@
 namespace nbt
 {
 
-value_initializer::value_initializer(std::unique_ptr<tag>&& t): value_(std::move(t)) {}
-value_initializer::value_initializer(value&& val): value_(std::move(val)) {}
-value_initializer::value_initializer(tag&& t): value_(std::move(t)) {}
+value_initializer::value_initializer(std::unique_ptr<tag>&& t): value(std::move(t)) {}
+value_initializer::value_initializer(value&& val): value(std::move(val)) {}
+value_initializer::value_initializer(tag&& t): value(std::move(t)) {}
 
-value_initializer::value_initializer(int8_t val): value_(tag_byte(val)) {}
-value_initializer::value_initializer(int16_t val): value_(tag_short(val)) {}
-value_initializer::value_initializer(int32_t val): value_(tag_int(val)) {}
-value_initializer::value_initializer(int64_t val): value_(tag_long(val)) {}
-value_initializer::value_initializer(float val): value_(tag_float(val)) {}
-value_initializer::value_initializer(double val): value_(tag_double(val)) {}
-value_initializer::value_initializer(const std::string& str): value_(tag_string(str)) {}
-value_initializer::value_initializer(std::string&& str): value_(tag_string(std::move(str))) {}
-value_initializer::value_initializer(const char* str): value_(tag_string(str)) {}
-
-value& value_initializer::get() { return value_; }
-const value& value_initializer::get() const { return value_; }
-value_initializer::operator value&() { return value_; }
-value_initializer::operator const value&() const { return value_; }
+value_initializer::value_initializer(int8_t val): value(tag_byte(val)) {}
+value_initializer::value_initializer(int16_t val): value(tag_short(val)) {}
+value_initializer::value_initializer(int32_t val): value(tag_int(val)) {}
+value_initializer::value_initializer(int64_t val): value(tag_long(val)) {}
+value_initializer::value_initializer(float val): value(tag_float(val)) {}
+value_initializer::value_initializer(double val): value(tag_double(val)) {}
+value_initializer::value_initializer(const std::string& str): value(tag_string(str)) {}
+value_initializer::value_initializer(std::string&& str): value(tag_string(std::move(str))) {}
+value_initializer::value_initializer(const char* str): value(tag_string(str)) {}
 
 }