gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Variant

Browse Source 
- Updated operator< to handle trivial values.
This commit is contained in:
Paul Beckingham
2014-06-16 18:38:43 -04:00
parent 8e16a3e0e4
commit 7484b5a22f
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Variant.cpp
View File

@@ -296,11 +296,25 @@ bool Variant::operator< (const Variant& other) const
}
else
{
if (left.trivial () || right.trivial ())
return false;
return left._string < right._string;
}
case type_date: left.cast (type_date); return left._date < right._date;
case type_duration: left.cast (type_duration); return left._duration < right._duration;
case type_date:
if (left.trivial () || right.trivial ())
return false;
left.cast (type_date);
return left._date < right._date;
case type_duration:
if (left.trivial () || right.trivial ())
return false;
left.cast (type_duration);
return left._duration < right._duration;
}
break;
@@ -316,10 +330,10 @@ bool Variant::operator< (const Variant& other) const
case type_string:
case type_date:
case type_duration:
right.cast (type_date);
if (left._date == 0 || right._date == 0)
if (left.trivial () || right.trivial ())
return false;
right.cast (type_date);
return left._date < right._date;
}
break;
@@ -336,10 +350,10 @@ bool Variant::operator< (const Variant& other) const
case type_string:
case type_date:
case type_duration:
right.cast (type_duration);
if (left._duration == 0 || right._duration == 0)
if (left.trivial () || right.trivial ())
return false;
right.cast (type_duration);
return left._duration < right._duration;
}
break;