mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-29 00:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(Variant): add getValueAsUnsignedNumber impl

Browse source
This commit is contained in:
Ronan Abhamon 2017-09-25 15:28:36 +02:00
parent fc861ade8a
commit 352aa5568c
3 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linphone/utils/utils.h
View file

@ -71,12 +71,14 @@ namespace Utils {
LINPHONE_PUBLIC int stoi (const std::string &str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC long long stoll (const std::string &str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC unsigned long long stoull (const std::string &str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC double stod (const std::string &str, size_t *idx = 0);
LINPHONE_PUBLIC float stof (const std::string &str, size_t *idx = 0);
LINPHONE_PUBLIC bool stob (const std::string &str);
LINPHONE_PUBLIC int stoi (const char *str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC long long stoll (const char *str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC unsigned long long stoull (const char *str, size_t *idx = 0, int base = 10);
LINPHONE_PUBLIC double stod (const char *str, size_t *idx = 0);
LINPHONE_PUBLIC float stof (const char *str, size_t *idx = 0);

14
src/utils/utils.cpp
View file

@ -92,6 +92,10 @@ long long Utils::stoll (const string &str, size_t *idx, int base) {
return stoll(str.c_str(), idx, base);
}
unsigned long long Utils::stoull (const string &str, size_t *idx, int base) {
return stoull(str.c_str(), idx, base);
}
double Utils::stod (const string &str, size_t *idx) {
return stod(str.c_str(), idx);
}
@ -125,6 +129,16 @@ long long Utils::stoll (const char *str, size_t *idx, int base) {
return v;
}
unsigned long long Utils::stoull (const char *str, size_t *idx, int base) {
char *p;
unsigned long long v = static_cast<int>(strtoull(str, &p, base));
if (idx)
*idx = static_cast<size_t>(p - str);
return v;
}
double Utils::stod (const char *str, size_t *idx) {
char *p;
double v = strtod(str, &p);

33
src/variant/variant.cpp
View file

@ -351,7 +351,38 @@ static inline long long getValueAsNumber (const VariantPrivate &p, bool *soFarSo
}
static inline unsigned long long getValueAsUnsignedNumber (const VariantPrivate &p, bool *soFarSoGood) {
// TODO.
const int type = p.getType();
L_ASSERT(type > Variant::Invalid && type < Variant::MaxDefaultTypes);
switch (static_cast<Variant::Type>(type)) {
case Variant::Int:
case Variant::Short:
case Variant::Long:
case Variant::LongLong:
case Variant::Char:
case Variant::Double:
case Variant::Float:
return static_cast<unsigned long long>(getAssumedNumber(p));
case Variant::UnsignedInt:
case Variant::UnsignedShort:
case Variant::UnsignedLong:
case Variant::UnsignedLongLong:
return getAssumedUnsignedNumber(p);
case Variant::Bool:
return static_cast<unsigned long long>(p.value.b);
case Variant::String:
return Utils::stoull(*p.value.str);
case Variant::Generic:
return static_cast<unsigned long long>(!!p.value.g);
default:
*soFarSoGood = false;
}
return 0;
}