From c44137191e8bbea719a7e81f870a7ee34b45b108 Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Tue, 8 Sep 2015 13:21:14 -0700 Subject: [PATCH] Fixed CPP Conversion of nested array types The CPP array type was incorrectly using reserve instead of resize for the smaller vectors. This resulted in the index-assignment of each element to not work properly. This patch fixes this, so that the arrays are properly loaded. Change-Id: I29eb78a1dc69602087ba9861a378f478d611b0f0 Signed-off-by: Erich Keane Reviewed-on: https://gerrit.iotivity.org/gerrit/2412 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/src/OCRepresentation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp index 70d699e..f65f4b0 100644 --- a/resource/src/OCRepresentation.cpp +++ b/resource/src/OCRepresentation.cpp @@ -480,7 +480,7 @@ namespace OC std::vector> val(pl->arr.dimensions[0]); for(size_t i = 0; i < pl->arr.dimensions[0]; ++i) { - val[i].reserve(pl->arr.dimensions[1]); + val[i].resize(pl->arr.dimensions[1]); for(size_t j = 0; j < pl->arr.dimensions[1]; ++j) { val[i][j] = payload_array_helper_copy( @@ -494,10 +494,10 @@ namespace OC std::vector>> val; for(size_t i = 0; i < pl->arr.dimensions[0]; ++i) { - val[i].reserve(pl->arr.dimensions[1]); + val[i].resize(pl->arr.dimensions[1]); for(size_t j = 0; j < pl->arr.dimensions[1]; ++j) { - val[i][j].reserve(pl->arr.dimensions[2]); + val[i][j].resize(pl->arr.dimensions[2]); for(size_t k = 0; k < pl->arr.dimensions[2]; ++k) { val[i][j][k] = payload_array_helper_copy( -- 2.7.4