GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "C++11: Converted from strtoimax to std::stoi"

Browse source 
This reverts commit 36ad7ead41.
This commit is contained in:
Paul Beckingham 2015-11-02 18:42:35 -05:00
parent 5a01fe003d
commit ee40f89804
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Config.cpp
View file

@ -31,6 +31,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#include <sys/stat.h> #include <sys/stat.h>
#include <inttypes.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <ISO8601.h> #include <ISO8601.h>
@ -563,7 +564,7 @@ std::string Config::get (const std::string& key)
int Config::getInteger (const std::string& key) int Config::getInteger (const std::string& key)
{ {
if ((*this).find (key) != (*this).end ()) if ((*this).find (key) != (*this).end ())
return stoi ((*this)[key]); return strtoimax ((*this)[key].c_str (), NULL, 10);
return 0; return 0;
} }

11
src/Nibbler.cpp
View file

@ -28,6 +28,7 @@
#include <Nibbler.h> #include <Nibbler.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <inttypes.h>
#include <Lexer.h> #include <Lexer.h>
#include <util.h> #include <util.h>
@ -263,7 +264,7 @@ bool Nibbler::getDigit4 (int& result)
Lexer::isDigit ((*_input)[i + 2]) && Lexer::isDigit ((*_input)[i + 2]) &&
Lexer::isDigit ((*_input)[i + 3])) Lexer::isDigit ((*_input)[i + 3]))
{ {
result = std::stoi (_input->substr (_cursor, 4)); result = strtoimax (_input->substr (_cursor, 4).c_str (), NULL, 10);
_cursor += 4; _cursor += 4;
return true; return true;
} }
@ -283,7 +284,7 @@ bool Nibbler::getDigit3 (int& result)
Lexer::isDigit ((*_input)[i + 1]) && Lexer::isDigit ((*_input)[i + 1]) &&
Lexer::isDigit ((*_input)[i + 2])) Lexer::isDigit ((*_input)[i + 2]))
{ {
result = std::stoi (_input->substr (_cursor, 3)); result = strtoimax (_input->substr (_cursor, 3).c_str (), NULL, 10);
_cursor += 3; _cursor += 3;
return true; return true;
} }
@ -302,7 +303,7 @@ bool Nibbler::getDigit2 (int& result)
if (Lexer::isDigit ((*_input)[i + 0]) && if (Lexer::isDigit ((*_input)[i + 0]) &&
Lexer::isDigit ((*_input)[i + 1])) Lexer::isDigit ((*_input)[i + 1]))
{ {
result = std::stoi (_input->substr (_cursor, 2)); result = strtoimax (_input->substr (_cursor, 2).c_str (), NULL, 10);
_cursor += 2; _cursor += 2;
return true; return true;
} }
@ -330,7 +331,7 @@ bool Nibbler::getInt (int& result)
if (i > _cursor) if (i > _cursor)
{ {
result = std::stoi (_input->substr (_cursor, i - _cursor)); result = strtoimax (_input->substr (_cursor, i - _cursor).c_str (), NULL, 10);
_cursor = i; _cursor = i;
return true; return true;
} }
@ -348,7 +349,7 @@ bool Nibbler::getUnsignedInt (int& result)
if (i > _cursor) if (i > _cursor)
{ {
result = std::stoi (_input->substr (_cursor, i - _cursor)); result = strtoimax (_input->substr (_cursor, i - _cursor).c_str (), NULL, 10);
_cursor = i; _cursor = i;
return true; return true;
} }