From 1015a9d2a6b346dbab1531f2f2bf14ae71af9135 Mon Sep 17 00:00:00 2001 From: Jakub Pawlewicz Date: Fri, 13 Apr 2018 10:09:12 +0200 Subject: [PATCH] Fixed ValueGet for containters --- uppsrc/Core/Rpc/Rpc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/uppsrc/Core/Rpc/Rpc.h b/uppsrc/Core/Rpc/Rpc.h index 70fdcdc18..0177e628c 100644 --- a/uppsrc/Core/Rpc/Rpc.h +++ b/uppsrc/Core/Rpc/Rpc.h @@ -50,7 +50,7 @@ void ValueGet(Array& x, const Value& v) ValueArray va = v; x.SetCount(va.GetCount()); for(int i = 0; i < va.GetCount(); i++) - ValueGet(x[i], va[i]); + ValueGet(x[i], va[i]); } template @@ -60,7 +60,7 @@ void ValueGet(Vector& x, const Value& v) ValueArray va = v; x.SetCount(va.GetCount()); for(int i = 0; i < va.GetCount(); i++) - ValueGet(x[i], va[i]); + ValueGet(x[i], va[i]); } template @@ -72,7 +72,7 @@ void ValueGet(ArrayMap& x, const Value& v) ValueArray va = vm.GetValues(); x.Clear(); for(int i = 0; i < k.GetCount(); i++) - x.Add(k[i], va[i]); + ValueGet(x.Add(k[i]), va[i]); } template @@ -84,7 +84,7 @@ void ValueGet(VectorMap& x, const Value& v) ValueArray va = vm.GetValues(); x.Clear(); for(int i = 0; i < k.GetCount(); i++) - x.Add(k[i], va[i]); + ValueGet(x.Add(k[i]), va[i]); } template @@ -96,7 +96,7 @@ void ValueGet(ArrayMap& x, const Value& v) ValueArray va = vm.GetValues(); x.Clear(); for(int i = 0; i < k.GetCount(); i++) - x.Add(atoi(AsString(k[i])), va[i]); + ValueGet(x.Add(atoi(AsString(k[i]))), va[i]); } template @@ -108,7 +108,7 @@ void ValueGet(VectorMap& x, const Value& v) ValueArray va = vm.GetValues(); x.Clear(); for(int i = 0; i < k.GetCount(); i++) - x.Add(atoi(AsString(k[i])), va[i]); + ValueGet(x.Add(atoi(AsString(k[i]))), va[i]); } void ValuePut(Value& v, int n); -- 2.14.1