diff options
| author | ljfa-ag <ljfa-ag@web.de> | 2015-07-09 18:25:23 +0200 |
|---|---|---|
| committer | ljfa-ag <ljfa-ag@web.de> | 2015-07-09 18:25:23 +0200 |
| commit | 125c0c3acbac2b1aabdcc6d2b7f1a84c16d4b38e (patch) | |
| tree | eb08cad384efbb5a6d37b75d313a1851cab8d679 /src/value_initializer.cpp | |
| parent | 4945e533c37d261e82d34ea129f441be06385cce (diff) | |
| download | Project-Tick-125c0c3acbac2b1aabdcc6d2b7f1a84c16d4b38e.tar.gz Project-Tick-125c0c3acbac2b1aabdcc6d2b7f1a84c16d4b38e.zip | |
Make value_initializer inherit from value
Diffstat (limited to 'src/value_initializer.cpp')
| -rw-r--r-- | src/value_initializer.cpp | 29 |
1 files changed, 12 insertions, 17 deletions
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)) {} } |
