diff --git a/src/TDB2.cpp b/src/TDB2.cpp index 90ffb2b23..15d0d1fab 100644 --- a/src/TDB2.cpp +++ b/src/TDB2.cpp @@ -1753,9 +1753,9 @@ int TDB2::next_id () const std::vector TDB2::all_tasks () { std::vector all (pending._tasks.size () + - pending._added_tasks.size () + - completed._tasks.size () + - completed._added_tasks.size ()); + pending._added_tasks.size () + + completed._tasks.size () + + completed._added_tasks.size ()); all = pending.get_tasks (); std::vector extra (completed._tasks.size () + diff --git a/src/Task.cpp b/src/Task.cpp index 7f9b5a7cb..e38cc22df 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -58,6 +58,7 @@ extern Context context; static const float epsilon = 0.000001; +#endif std::string Task::defaultProject = ""; std::string Task::defaultPriority = ""; @@ -79,7 +80,6 @@ float Task::urgencyNextCoefficient = 0.0; float Task::urgencyDueCoefficient = 0.0; float Task::urgencyBlockingCoefficient = 0.0; float Task::urgencyAgeCoefficient = 0.0; -#endif static const std::string dummy ("");