diff options
Diffstat (limited to 'modules/codec-json')
| -rw-r--r-- | modules/codec-json/c++/json.tmpl.hpp | 2 | ||||
| -rw-r--r-- | modules/codec-json/tests/codec-json.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/codec-json/c++/json.tmpl.hpp b/modules/codec-json/c++/json.tmpl.hpp index bead73a..1eb46bc 100644 --- a/modules/codec-json/c++/json.tmpl.hpp +++ b/modules/codec-json/c++/json.tmpl.hpp @@ -109,7 +109,7 @@ struct json_encode<schema::String, FromEncode> { return err; } } - for(std::size_t i = 0; i < from.size(); ++i){ + for(std::size_t i = 0; i < from.size().get(); ++i){ auto err = to.push(from.get_at(i)); if(!err.template is_type<err::no_error>()){ return err; diff --git a/modules/codec-json/tests/codec-json.cpp b/modules/codec-json/tests/codec-json.cpp index 1d6c0f0..95b0d40 100644 --- a/modules/codec-json/tests/codec-json.cpp +++ b/modules/codec-json/tests/codec-json.cpp @@ -273,10 +273,10 @@ SAW_TEST("Three Dim Array write and read"){ data<schema::TestMultiArray, encode::Native> native{2,1,2}; data<schema::TestMultiArray, encode::Json> json; - native.at(0,0,0).set("multi"); - native.at(0,0,1).set("baz"); - native.at(1,0,0).set("foo"); - native.at(1,0,1).set("bar"); + native.at({0,0,0}).set("multi"); + native.at({0,0,1}).set("baz"); + native.at({1,0,0}).set("foo"); + native.at({1,0,1}).set("bar"); codec<schema::TestMultiArray, encode::Json> codec; @@ -291,10 +291,10 @@ SAW_TEST("Three Dim Array write and read"){ native = {}; eov = codec.decode(json, native); SAW_EXPECT(eov.is_value(), "Decoding error"); - SAW_EXPECT(native.at(0,0,0) == "multi", "Invalid Value at 0,0,0"); - SAW_EXPECT(native.at(0,0,1) == "baz", "Invalid Value at 0,0,1"); - SAW_EXPECT(native.at(1,0,0) == "foo", "Invalid Value at 1,0,0"); - SAW_EXPECT(native.at(1,0,1) == "bar", "Invalid Value at 1,0,1"); + SAW_EXPECT(native.at({0,0,0}) == "multi", "Invalid Value at 0,0,0"); + SAW_EXPECT(native.at({0,0,1}) == "baz", "Invalid Value at 0,0,1"); + SAW_EXPECT(native.at({1,0,0}) == "foo", "Invalid Value at 1,0,0"); + SAW_EXPECT(native.at({1,0,1}) == "bar", "Invalid Value at 1,0,1"); } |