Implement value_initializer

2 files changed, 45 insertions, 3 deletions

diff --git a/src/tag_compound.cpp b/src/tag_compound.cpp
index f26044ce20..a2b91826b6 100644
--- a/src/tag_compound.cpp
+++ b/src/tag_compound.cpp
@@ -22,10 +22,10 @@
 namespace nbt
 {
 
-tag_compound::tag_compound(std::initializer_list<std::pair<std::string, value_initializer&&>> init)
+tag_compound::tag_compound(std::initializer_list<std::pair<std::string, value_initializer>> init)
 {
-    for(auto& pair: init)
-        tags.emplace(pair);
+    for(const auto& pair: init)
+        tags.emplace(std::move(pair.first), std::move(pair.second.get()));
 }
 
 value& tag_compound::at(const std::string& key)
diff --git a/src/value_initializer.cpp b/src/value_initializer.cpp
new file mode 100644
index 0000000000..8d57933e09
--- /dev/null
+++ b/src/value_initializer.cpp
@@ -0,0 +1,42 @@
+/*
+ * libnbt++ - A library for the Minecraft Named Binary Tag format.
+ * Copyright (C) 2013, 2015  ljfa-ag
+ *
+ * This file is part of libnbt++.
+ *
+ * libnbt++ is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * libnbt++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libnbt++.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "value_initializer.h"
+#include "libnbt.h"
+
+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(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() const { return value_; }
+
+}