From ab22d9a04c829f198b7fdb64bfb6640dcd447ca1 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 23 Mar 2017 23:30:37 +0000
Subject: [PATCH] CtrlLib: ArrayCtrl fixed to compile

git-svn-id: svn://ultimatepp.org/upp/trunk@10969 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/ArrayCtrl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index 6a268f621..6083a2e46 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -46,7 +46,7 @@ ArrayCtrl::Column& ArrayCtrl::Column::SetConvert(const Convert& c) {
 	return *this;
 }
 
-Column& ArrayCtrl::Column::ConvertBy(Function<Value(const Value&)> cv)
+ArrayCtrl::Column& ArrayCtrl::Column::ConvertBy(Function<Value(const Value&)> cv)
 {
 	convertby = cv;
 	ClearCache();
@@ -540,15 +540,15 @@ Value ArrayCtrl::GetConvertedColumn(int i, int col) const {
 	if(m.cached) {
 		if(m.cache.IsEmpty())
 			m.cache.Create< Vector<String> >();
-		if(IsString(r) && m.cache.Is< Vector<String> >())
+		if(IsString(v) && m.cache.Is< Vector<String> >())
 			m.cache.Get< Vector<String> >().At(i, String::GetVoid()) = v;
-		if(!IsString(r) && m.cache.Is< Vector<String> >())
+		if(!IsString(v) && m.cache.Is< Vector<String> >())
 			m.cache.Create< Vector<Value> >();
 		if(m.cache.Is< Vector<Value> >())
 			m.cache.Get< Vector<Value> >().At(i) = v;
 		ASSERT(m.pos.GetCount() || m.cache.IsEmpty());
 	}
-	return r;
+	return v;
 }
 
 int ArrayCtrl::GetCount() const {