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

Portability: Updated to make main re-entrant()

Browse Source 
- New INSTALL instructions to emscripten, and AUTHORS for contribution.
This commit is contained in:
Mark Scannell
2018-01-31 19:45:07 -05:00
committed by Paul Beckingham
parent cae3f06b7d
commit 7af6db4c17
112 changed files with 960 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sort.cpp
View File

@@ -35,8 +35,6 @@
#include <shared.h>
#include <format.h>
extern Context context;
static std::vector <Task>* global_data = NULL;
static std::vector <std::string> global_keys;
static bool sort_compare (int, int);
@@ -58,7 +56,7 @@ void sort_tasks (
if (order.size ())
std::stable_sort (order.begin (), order.end (), sort_compare);
context.time_sort_us += timer.total_us ();
Context::getContext ().time_sort_us += timer.total_us ();
}
////////////////////////////////////////////////////////////////////////////////
@@ -79,7 +77,7 @@ static bool sort_compare (int left, int right)
for (auto& k : global_keys)
{
context.decomposeSortField (k, field, ascending, breakIndicator);
Context::getContext ().decomposeSortField (k, field, ascending, breakIndicator);
// Urgency.
if (field == "urgency")
@@ -170,8 +168,8 @@ static bool sort_compare (int left, int right)
return !ascending;
// Sort on the first dependency.
left_number = context.tdb2.id (left_string.substr (0, 36));
right_number = context.tdb2.id (right_string.substr (0, 36));
left_number = Context::getContext ().tdb2.id (left_string.substr (0, 36));
right_number = Context::getContext ().tdb2.id (right_string.substr (0, 36));
if (left_number == right_number)
continue;
@@ -196,7 +194,7 @@ static bool sort_compare (int left, int right)
}
// UDAs.
else if ((column = context.columns[field]) != NULL)
else if ((column = Context::getContext ().columns[field]) != NULL)
{
std::string type = column->type ();
if (type == "numeric")