atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] android compilation error

Browse Source
This commit is contained in:
Edouard DUPIN 2014-08-27 05:33:05 +02:00
parent 87045cefae
commit bee6e06720
2 changed files with 139 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
etk/stdTools.cpp
View File

@ -274,7 +274,11 @@ namespace etk {
} }
template<> std::string to_string<int64_t>(const int64_t& _val) { template<> std::string to_string<int64_t>(const int64_t& _val) {
char tmpVal[256]; char tmpVal[256];
sprintf(tmpVal, "%ld", _val); #if (defined(__TARGET_OS__Android))
sprintf(tmpVal, "%lld", _val);
#else
sprintf(tmpVal, "%ld", _val);
#endif
return tmpVal; return tmpVal;
} }
template<> std::string to_string<uint8_t>(const uint8_t& _val) { template<> std::string to_string<uint8_t>(const uint8_t& _val) {
@ -294,7 +298,11 @@ namespace etk {
} }
template<> std::string to_string<uint64_t>(const uint64_t& _val) { template<> std::string to_string<uint64_t>(const uint64_t& _val) {
char tmpVal[256]; char tmpVal[256];
sprintf(tmpVal, "%lu", _val); #if (defined(__TARGET_OS__Android))
sprintf(tmpVal, "%llu", _val);
#else
sprintf(tmpVal, "%lu", _val);
#endif
return tmpVal; return tmpVal;
} }
template<> std::string to_string<float>(const float& _val) { template<> std::string to_string<float>(const float& _val) {
@ -827,7 +835,11 @@ int32_t etk::string_to_int32_t(const std::string& _str, int _base) {
} }
int64_t etk::string_to_int64_t(const std::string& _str, int _base) { int64_t etk::string_to_int64_t(const std::string& _str, int _base) {
int64_t ret = 0; int64_t ret = 0;
sscanf(_str.c_str(), "%ld", &ret); #if (defined(__TARGET_OS__Android))
sscanf(_str.c_str(), "%lld", &ret);
#else
sscanf(_str.c_str(), "%ld", &ret);
#endif
return ret; return ret;
} }
uint8_t etk::string_to_uint8_t(const std::string& _str, int _base) { uint8_t etk::string_to_uint8_t(const std::string& _str, int _base) {
@ -846,8 +858,12 @@ uint32_t etk::string_to_uint32_t(const std::string& _str, int _base) {
return ret; return ret;
} }
uint64_t etk::string_to_uint64_t(const std::string& _str, int _base) { uint64_t etk::string_to_uint64_t(const std::string& _str, int _base) {
int64_t ret = 0; uint64_t ret = 0;
sscanf(_str.c_str(), "%ld", &ret); #if (defined(__TARGET_OS__Android))
sscanf(_str.c_str(), "%llu", &ret);
#else
sscanf(_str.c_str(), "%lu", &ret);
#endif
return ret; return ret;
} }
@ -1025,3 +1041,93 @@ std::ostream& std::operator <<(std::ostream& _os, const std::vector<std::u32stri
return _os; return _os;
} }
#if (defined(__TARGET_OS__Android))
std::string std::to_string(int _val) {
char tmpVal[256];
sprintf(tmpVal, "%d", _val);
return tmpVal;
}
std::string std::to_string(long _val) {
char tmpVal[256];
sprintf(tmpVal, "%ld", _val);
return tmpVal;
}
std::string std::to_string(long long _val) {
char tmpVal[256];
sprintf(tmpVal, "%lld", _val);
return tmpVal;
}
std::string std::to_string(unsigned _val) {
char tmpVal[256];
sprintf(tmpVal, "%u", _val);
return tmpVal;
}
std::string std::to_string(unsigned long _val) {
char tmpVal[256];
sprintf(tmpVal, "%lu", _val);
return tmpVal;
}
std::string std::to_string(unsigned long long _val) {
char tmpVal[256];
sprintf(tmpVal, "%llu", _val);
return tmpVal;
}
std::string std::to_string(float _val) {
char tmpVal[256];
sprintf(tmpVal, "%f", _val);
return tmpVal;
}
std::string std::to_string(double _val) {
char tmpVal[256];
sprintf(tmpVal, "%f", _val);
return tmpVal;
}
std::string std::to_string(long double _val) {
char tmpVal[256];
sprintf(tmpVal, "%Lf", _val);
return tmpVal;
}
double std::stod(const std::string& _str, size_t* _idx) {
double ret = 0;
sscanf(_str.c_str(), "%lf", &ret);
return ret;
}
float std::stof(const std::string& _str, size_t* _idx) {
float ret = 0;
sscanf(_str.c_str(), "%f", &ret);
return ret;
}
int std::stoi(const std::string& _str, size_t* _idx, int _base) {
int ret = 0;
sscanf(_str.c_str(), "%d", &ret);
return ret;
}
long std::stol(const std::string& _str, size_t* _idx, int _base) {
long ret = 0;
sscanf(_str.c_str(), "%ld", &ret);
return ret;
}
long double std::stold(const std::string& _str, size_t* _idx) {
long double ret = 0;
sscanf(_str.c_str(), "%Lf", &ret);
return ret;
}
long long std::stoll(const std::string& _str, size_t* _idx, int _base) {
long long ret = 0;
sscanf(_str.c_str(), "%lld", &ret);
return ret;
}
unsigned long std::stoul(const std::string& _str, size_t* _idx, int _base) {
unsigned long ret = 0;
sscanf(_str.c_str(), "%lu", &ret);
return ret;
}
unsigned long long std::stoull(const std::string& _str, size_t* _idx, int _base) {
unsigned long long ret = 0;
sscanf(_str.c_str(), "%llu", &ret);
return ret;
}
#endif

28
etk/stdTools.h
View File

@ -64,6 +64,34 @@ namespace std {
#ifdef __TARGET_OS__MacOs #ifdef __TARGET_OS__MacOs
typedef std::basic_string<char32_t> u32string; typedef std::basic_string<char32_t> u32string;
#endif #endif
#if (defined(__TARGET_OS__Android))
//! @previous
std::string to_string(int _val);
//! @previous
std::string to_string(long _val);
//! @previous
std::string to_string(long long _val);
//! @previous
std::string to_string(unsigned _val);
//! @previous
std::string to_string(unsigned long _val);
//! @previous
std::string to_string(unsigned long long _val);
//! @previous
std::string to_string(float _val);
//! @previous
std::string to_string(double _val);
//! @previous
std::string to_string(long double _val);
double stod(const std::string& _str, size_t* _idx = 0);
float stof(const std::string& _str, size_t* _idx = 0);
int stoi(const std::string& _str, size_t* _idx = 0, int _base = 10);
long stol(const std::string& _str, size_t* _idx = 0, int _base = 10);
long double stold(const std::string& _str, size_t* _idx = 0);
long long stoll(const std::string& _str, size_t* _idx = 0, int _base = 10);
unsigned long stoul(const std::string& _str, size_t* _idx = 0, int _base = 10);
unsigned long long stoull(const std::string& _str, size_t* _idx = 0, int _base = 10);
#endif
}; };
namespace etk { namespace etk {
// these declaration is to prevent some under template declaration of unknown type // these declaration is to prevent some under template declaration of unknown type