0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add lexical casts for double

Browse source
This commit is contained in:
Jon Daniel 2012-05-02 16:57:58 +00:00
parent f02470d739
commit 15c46090d5
2 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/util.cpp
View file

@ -197,22 +197,55 @@ int lexical_cast_default<int, const char*>(const char* a, int def)
}
}
#ifndef MSVC_DO_UNIT_TESTS
template<>
double lexical_cast_default<double, const std::string&>(const std::string& a, double def)
double lexical_cast<double, const std::string&>(const std::string& a)
{
if(a.empty()) {
return def;
}
char* endptr;
double res = strtod(a.c_str(), &endptr);
if (*endptr != '\0') {
if (a.empty() || *endptr != '\0') {
throw bad_lexical_cast();
} else {
return res;
}
}
template<>
double lexical_cast<double, const char*>(const char* a)
{
char* endptr;
double res = strtod(a, &endptr);
if (*a == '\0' || *endptr != '\0') {
throw bad_lexical_cast();
} else {
return res;
}
}
template<>
double lexical_cast_default<double, const std::string&>(const std::string& a, double def)
{
char* endptr;
double res = strtod(a.c_str(), &endptr);
if (a.empty() || *endptr != '\0') {
return def;;
} else {
return res;
}
}
template<>
double lexical_cast_default<double, const char*>(const char* a, double def)
{
char* endptr;
double res = strtod(a, &endptr);
if (*a == '\0' || *endptr != '\0') {
return def;
} else {
return res;
}
}
#endif

12
src/util.hpp
View file

@ -129,6 +129,18 @@ int lexical_cast_default<int, const std::string&>(const std::string& a, int def)
template<>
int lexical_cast_default<int, const char*>(const char* a, int def);
template<>
double lexical_cast<double, const std::string&>(const std::string& a);
template<>
double lexical_cast<double, const char*>(const char* a);
template<>
double lexical_cast_default<double, const std::string&>(const std::string& a, double def);
template<>
double lexical_cast_default<double, const char*>(const char* a, double def);
template<typename From>
std::string str_cast(From a)
{