drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox/std] Remove C-style casts

Browse Source
This commit is contained in:
Gary Talent 2019-03-04 19:42:22 -06:00
parent 564ca7511c
commit 9844416a4e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps/ox/src/ox/std/memops.cpp vendored
View File

@ -25,16 +25,16 @@ int ox_memcmp(const void *ptr1, const void *ptr2, std::size_t size) noexcept {
} }
void *ox_memcpy(void *dest, const void *src, int64_t size) noexcept { void *ox_memcpy(void *dest, const void *src, int64_t size) noexcept {
char *srcBuf = (char*) src; auto srcBuf = static_cast<const char*>(src);
char *dstBuf = (char*) dest; auto dstBuf = static_cast<char*>(dest);
for (int64_t i = 0; i < size; i++) { for (int64_t i = 0; i < size; i++) {
dstBuf[i] = (char) srcBuf[i]; dstBuf[i] = static_cast<char>(srcBuf[i]);
} }
return dest; return dest;
} }
void *ox_memset(void *ptr, int val, int64_t size) noexcept { void *ox_memset(void *ptr, int val, int64_t size) noexcept {
char *buf = (char*) ptr; auto buf = static_cast<char*>(ptr);
for (int64_t i = 0; i < size; i++) { for (int64_t i = 0; i < size; i++) {
buf[i] = val; buf[i] = val;
} }

8
deps/ox/src/ox/std/string.hpp vendored
View File

@ -96,7 +96,7 @@ constexpr const BString<size> &BString<size>::operator=(const char *str) noexcep
template<std::size_t size> template<std::size_t size>
constexpr const BString<size> &BString<size>::operator=(char *str) noexcept { constexpr const BString<size> &BString<size>::operator=(char *str) noexcept {
return *this = (const char*) str; return *this = static_cast<const char*>(str);
} }
template<std::size_t size> template<std::size_t size>
@ -114,7 +114,7 @@ constexpr const BString<size> &BString<size>::operator+=(const char *str) noexce
template<std::size_t size> template<std::size_t size>
constexpr const BString<size> &BString<size>::operator+=(char *str) noexcept { constexpr const BString<size> &BString<size>::operator+=(char *str) noexcept {
return *this += (const char*) str; return *this = static_cast<const char*>(str);
} }
template<std::size_t size> template<std::size_t size>
@ -155,12 +155,12 @@ constexpr char &BString<buffLen>::operator[](std::size_t i) noexcept {
template<std::size_t buffLen> template<std::size_t buffLen>
constexpr char *BString<buffLen>::data() noexcept { constexpr char *BString<buffLen>::data() noexcept {
return (char*) m_buff; return static_cast<char*>(m_buff);
} }
template<std::size_t buffLen> template<std::size_t buffLen>
constexpr const char *BString<buffLen>::c_str() const noexcept { constexpr const char *BString<buffLen>::c_str() const noexcept {
return (const char*) m_buff; return static_cast<const char*>(m_buff);
} }

5
deps/ox/src/ox/std/strops.cpp vendored
View File

@ -23,7 +23,8 @@ static_assert([] {
static_assert([] { static_assert([] {
int retval = 0; int retval = 0;
auto testStr = "aaaa"; auto testStr = "aaaa";
retval |= !(ox_lastIndexOf((char*) testStr, 'a', ox_strlen(testStr)) == 3); // test the const and non-const versions of ox_lastIndexOf
retval |= !(ox_lastIndexOf((const char*) testStr, 'a', ox_strlen(testStr)) == 3); retval |= !(ox_lastIndexOf(const_cast<char*>(testStr), 'a', ox_strlen(testStr)) == 3);
retval |= !(ox_lastIndexOf(testStr, 'a', ox_strlen(testStr)) == 3);
return retval == 0; return retval == 0;
}(), "ox_lastIndexOf aaaa a"); }(), "ox_lastIndexOf aaaa a");