tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "refs #166: fix for std::stoll et al. not handling strings"

Browse Source 
This reverts commit bc29ed5a9c.
This commit is contained in:
Justin R. Miller
2014-05-12 17:14:28 -07:00
parent 38e7682302
commit 654520ea34
1 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/llmr/style/value.hpp
View File

@@ -34,51 +34,21 @@ template <> struct string_to_number<bool> {
template <> struct string_to_number<double> {
double operator()(std::string const &str) const {
int val = string_to_bool(str);
if (val < 0) {
try {
double b = std::stod(str);
return b;
} catch (std::invalid_argument const& ex) {
return false;
}
} else {
return val;
}
return false;
return val < 0 ? std::stod(str) : val;
}
};
template <> struct string_to_number<int64_t> {
int64_t operator()(std::string const &str) const {
int val = string_to_bool(str);
if (val < 0) {
try {
long long b = std::stoll(str);
return b;
} catch (std::invalid_argument const& ex) {
return false;
}
} else {
return val;
}
return false;
return val < 0 ? std::stoll(str) : val;
}
};
template <> struct string_to_number<uint64_t> {
uint64_t operator()(std::string const &str) const {
int val = string_to_bool(str);
if (val < 0) {
try {
unsigned long long b = std::stoull(str);
return b;
} catch (std::invalid_argument const& ex) {
return false;
}
} else {
return val;
}
return false;
return val < 0 ? std::stoull(str) : val;
}
};