feedc0de/cpputils
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Downgrade for old compiler

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-07-11 16:04:27 +02:00
parent b8e9f6f482
commit de45ffa3e1
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/numberparsing.h
View File

@ -62,19 +62,19 @@ template<> inline tl::expected<uint32_t, std::string> fromString<uint32_t>(std::
}
#ifdef ESP_PLATFORM
template<> inline tl::expected<int, std::string> fromString<int>(std::string_view str)
template<> inline tl::expected<long, std::string> fromString<long>(std::string_view str)
{
int val;
if (std::sscanf(str.data(), "%" SCNi32, &val) != 1)
return tl::make_unexpected(fmt::format("invalid int {}", str));
long val;
if (std::sscanf(str.data(), "%li", &val) != 1)
return tl::make_unexpected(fmt::format("invalid long {}", str));
return val;
}
template<> inline tl::expected<unsigned int, std::string> fromString<unsigned int>(std::string_view str)
template<> inline tl::expected<unsigned long, std::string> fromString<unsigned long>(std::string_view str)
{
unsigned int val;
if (std::sscanf(str.data(), "%" SCNu32, &val) != 1)
return tl::make_unexpected(fmt::format("invalid unsigned int {}", str));
unsigned long val;
if (std::sscanf(str.data(), "%lu", &val) != 1)
return tl::make_unexpected(fmt::format("invalid unsigned long {}", str));
return val;
}
#endif

8
src/refwhenneeded.h
View File

@ -13,10 +13,10 @@ template<> struct RefWhenNeeded<int16_t> { using T = int16_
template<> struct RefWhenNeeded<uint16_t> { using T = uint16_t; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<int32_t> { using T = int32_t; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<uint32_t> { using T = uint32_t; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<int> { using T = int; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<unsigned int> { using T = unsigned int; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<int64_t> { using T = int64_t; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<uint64_t> { using T = uint64_t; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<long> { using T = long; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<unsigned long> { using T = unsigned long; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<float> { using T = float; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<double> { using T = double; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<bool>> { using T = std::optional<bool>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
@ -26,10 +26,10 @@ template<> struct RefWhenNeeded<std::optional<int16_t>> { using T = std::o
template<> struct RefWhenNeeded<std::optional<uint16_t>> { using T = std::optional<uint16_t>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<int32_t>> { using T = std::optional<int32_t>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<uint32_t>> { using T = std::optional<uint32_t>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<int>> { using T = std::optional<int>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<unsigned int>> { using T = std::optional<unsigned int>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<int64_t>> { using T = std::optional<int64_t>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<uint64_t>> { using T = std::optional<uint64_t>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<long>> { using T = std::optional<long>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<unsigned long>> { using T = std::optional<unsigned long>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<float>> { using T = std::optional<float>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };
template<> struct RefWhenNeeded<std::optional<double>> { using T = std::optional<double>; RefWhenNeeded() = delete; ~RefWhenNeeded() = delete; };

13
src/strutils.cpp
View File

@ -118,6 +118,19 @@ bool stringEqualsIgnoreCase(std::string_view a, std::string_view b)
});
}
bool stringStartsWith(std::string_view fullString, std::string_view begin)
{
return fullString.rfind(begin, 0) == 0;
}
bool stringEndsWith(std::string_view fullString, std::string_view ending)
{
if (fullString.length() < ending.length())
return false;
return fullString.compare(fullString.length() - ending.length(), ending.length(), ending) == 0;
}
//void stringReplaceAll(char search, char replace, std::string &subject)
//{
// size_t start_pos{};

2
src/strutils.h
View File

@ -51,6 +51,8 @@ inline std::string toBase64String(std::string_view str)
}
bool stringEqualsIgnoreCase(std::string_view a, std::string_view b);
bool stringStartsWith(std::string_view fullString, std::string_view begin);
bool stringEndsWith(std::string_view fullString, std::string_view ending);
//void stringReplaceAll(char search, char replace, std::string &subject);
void stringReplaceAll(char search, std::string_view replace, std::string &subject);