github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: ArrayCtrl fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10969 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-03-23 23:30:37 +00:00
parent f642ab5892
commit ab22d9a04c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -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 {