diff options
| author | ljfa-ag <ljfa-ag@web.de> | 2015-07-15 15:42:23 +0200 |
|---|---|---|
| committer | ljfa-ag <ljfa-ag@web.de> | 2015-07-15 15:44:15 +0200 |
| commit | 0060f816c7798148556ebeb445510a3cc78161f2 (patch) | |
| tree | 77a74f2511e3d88e866a0fd84ffe6d6ebdd02104 /test/nbttest.cpp | |
| parent | 6ec54ee1766a1819d62771620e91328a188341d2 (diff) | |
| download | Project-Tick-0060f816c7798148556ebeb445510a3cc78161f2.tar.gz Project-Tick-0060f816c7798148556ebeb445510a3cc78161f2.zip | |
Revert "Turn tag_list::of into a subtype of tag_list"
This reverts commit 6ec54ee1766a1819d62771620e91328a188341d2.
Diffstat (limited to 'test/nbttest.cpp')
| -rw-r--r-- | test/nbttest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/nbttest.cpp b/test/nbttest.cpp index 12e36a5db7..3e043f750b 100644 --- a/test/nbttest.cpp +++ b/test/nbttest.cpp @@ -82,7 +82,7 @@ void test_tag_compound() {"foo", int16_t(12)}, {"bar", "baz"}, {"baz", -2.0}, - {"list", tag_list::of<tag_byte>{16, 17}} + {"list", tag_list::of<tag_byte>({16, 17})} }; ASSERT(comp["foo"].get_type() == tag_type::Short); @@ -120,7 +120,7 @@ void test_tag_compound() {"bar", "barbaz"}, {"baz", -2.0}, {"quux", tag_compound{{"Hello", "World"}, {"zero", 0}}}, - {"list", tag_list::of<tag_byte>{16, 17}} + {"list", tag_list::of<tag_byte>({16, 17})} }; ASSERT(comp == comp2); ASSERT(comp != (const tag_compound&)comp2["quux"]); @@ -249,8 +249,8 @@ void test_tag_list() list.pop_back(); ASSERT(list == tag_list{"foo"}); - ASSERT(list == tag_list::of<tag_string>{"foo"}); - ASSERT(tag_list::of<tag_string>{"foo"} == tag_list{"foo"}); + ASSERT(list == tag_list::of<tag_string>({"foo"})); + ASSERT(tag_list::of<tag_string>({"foo"}) == tag_list{"foo"}); ASSERT((list != tag_list{2, 3, 5, 7})); list.clear(); @@ -261,7 +261,7 @@ void test_tag_list() ASSERT(tag_list() == tag_list(tag_type::Int)); ASSERT(tag_list(tag_type::Short) == tag_list(tag_type::Int)); - tag_list::of<tag_short> short_list{25, 36}; + tag_list short_list = tag_list::of<tag_short>({25, 36}); ASSERT(short_list.el_type() == tag_type::Short); ASSERT((short_list == tag_list{int16_t(25), int16_t(36)})); ASSERT((short_list != tag_list{25, 36})); |
