commit b5d3c879

sago007 · 2016-10-09 09:37
b5d3c879bf077d8eb40c2f8001c9981392bd8a90 patch · browse files
parent 549ecfaea17ecd79082bdd93bb91b4a46afb30db

Also replaced the old stringstream converted method with std::stod and std::stoi

Changed files

M	source/code/common.cpp before

diff --git a/source/code/common.cpp b/source/code/common.cpp index a8aae2f..e4cf830 100644 --- a/source/code/common.cpp +++ b/source/code/common.cpp

@@ -34,9 +34,6 @@ using std::stringstream;

using std::cerr;

using std::map;

using std::vector;

-using boost::format;

-static stringstream converter;

bool strequals(const char* a, const char* b) {

return strcmp(a,b) == 0;

@@ -50,11 +47,7 @@ void dieOnNullptr(bool ptr, const char* msg) {

double str2double(const string& str2parse) {

try {

- converter.clear();

- converter.str(str2parse);

- double val = 0.0;

- converter >> val;

- return val;

+ return std::stod(str2parse);

}

catch (std::ios_base::failure& f) {

return 0.0;

@@ -83,11 +76,7 @@ const char* SPrintCF(const char* fmt, ...) {

int str2int(const string& str2parse) {

try {

- converter.clear();

- converter.str(str2parse);

- int val = 0;

- converter >> val;

- return val;

+ return std::stoi(str2parse);

}

catch (std::ios_base::failure& f) {

return 0;