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

Ide/Debggers/Gdb_MI2 : re-fix pick_ for linux

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6957 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2014-02-26 09:54:11 +00:00
parent 07e3e932c9
commit 81ee7ac988
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/ide/Debuggers/MIValue.cpp
View file

@ -370,7 +370,7 @@ int MIValue::Parse(String const &s, int i)
}
}
MIValue const &MIValue::operator=(MIValue &v)
MIValue &MIValue::operator=(pick_ MIValue &v)
{
Clear();
type = v.type;
@ -396,7 +396,7 @@ MIValue::MIValue()
Clear();
}
MIValue::MIValue(MIValue &v)
MIValue::MIValue(MIValue pick_ &v)
{
Clear();
type = v.type;
@ -429,7 +429,7 @@ MIValue::MIValue(String const &s)
}
}
MIValue const &MIValue::operator=(String const &s)
MIValue &MIValue::operator=(String const &s)
{
Parse(s);
// tuple with 1 element and unnamed key is a string
@ -736,7 +736,7 @@ void MIValue::FixArrays(void)
}
// add an item to a tuple
MIValue &MIValue::Add(String const &key, MIValue const &v)
MIValue &MIValue::Add(String const &key, MIValue pick_ &v)
{
if(IsEmpty())
{
@ -745,7 +745,7 @@ MIValue &MIValue::Add(String const &key, MIValue const &v)
}
if(type != MITuple)
return ErrorMIValue("Not a Tuple value type");
tuple.Add(key, v);
tuple.AddPick(key, v);
return *this;
}
@ -771,12 +771,12 @@ MIValue &MIValue::FindAdd(String const &key, String const &data)
if(idx >= 0)
tuple[idx] = v;
else
tuple.Add(key, v);
tuple.AddPick(key, v);
return *this;
}
// add an item to an array
MIValue &MIValue::Add(MIValue const &v)
MIValue &MIValue::Add(MIValue pick_ &v)
{
if(IsEmpty())
{
@ -785,7 +785,7 @@ MIValue &MIValue::Add(MIValue const &v)
}
if(type != MIArray)
return ErrorMIValue("Not a Array value type");
array.Add(v);
array.AddPick(v);
return *this;
}

10
uppsrc/ide/Debuggers/MIValue.h
View file

@ -38,10 +38,10 @@ class MIValue : public Moveable<MIValue>
// check for emptyness
bool IsEmpty(void) const;
MIValue const &operator=(MIValue &v);
MIValue const &operator=(String const &s);
MIValue &operator=(pick_ MIValue &v);
MIValue &operator=(String const &s);
MIValue();
MIValue(MIValue &v);
MIValue(MIValue pick_ &v);
MIValue(String const &s);
void Clear(void);
@ -107,12 +107,12 @@ class MIValue : public Moveable<MIValue>
// add some data to a value
// add an item to a tuple
MIValue &Add(String const &key, MIValue const &v);
MIValue &Add(String const &key, MIValue pick_ &v);
MIValue &Add(String const &key, String const &data);
MIValue &FindAdd(String const &key, String const &data);
// add an item to an array
MIValue &Add(MIValue const &v);
MIValue &Add(MIValue pick_ &v);
MIValue &Add(String const &data);
// remove a tuple key