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

Revert "Recurrence: Converted from strtol to std::stoi"

Browse Source 
This reverts commit 368df43583.
This commit is contained in:
Paul Beckingham
2015-11-02 18:39:55 -05:00
parent 5f1edbfce1
commit 993b94c701
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/recur.cpp
View File

@@ -240,7 +240,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
else if (Lexer::isDigit (period[0]) &&
period[period.length () - 1] == 'm')
{
int increment = std::stoi (period.substr (0, period.length () - 1));
int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
m += increment;
while (m > 12)
@@ -259,7 +259,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
Lexer::isAllDigits (period.substr (1, period.length () - 2)) &&
period[period.length () - 1] == 'M')
{
int increment = std::stoi (period.substr (0, period.length () - 1));
int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
m += increment;
while (m > 12)
@@ -292,7 +292,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q')
{
int increment = std::stoi (period.substr (0, period.length () - 1));
int increment = strtol (period.substr (0, period.length () - 1).c_str (), NULL, 10);
m += 3 * increment;
while (m > 12)
@@ -384,7 +384,7 @@ void updateRecurrenceMask (Task& task)
if (uuid != "" &&
context.tdb2.get (uuid, parent))
{
unsigned int index = std::stoi (task.get ("imask"));
unsigned int index = strtol (task.get ("imask").c_str (), NULL, 10);
std::string mask = parent.get ("mask");
if (mask.length () > index)
{