From: Erich Keane <erich.keane@intel.com>
Date: Tue, 8 Sep 2015 20:21:14 +0000 (-0700)
Subject: Fixed CPP Conversion of nested array types
X-Git-Tag: 1.2.0+RC1~1133^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c44137191e8bbea719a7e81f870a7ee34b45b108;p=platform%2Fupstream%2Fiotivity.git

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 <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2412
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---

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<std::vector<T>> 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<T>(
@@ -494,10 +494,10 @@ namespace OC
             std::vector<std::vector<std::vector<T>>> 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<T>(