diff --git a/deps/ox/src/ox/std/memops.cpp b/deps/ox/src/ox/std/memops.cpp index 581b45be..9c847e65 100644 --- a/deps/ox/src/ox/std/memops.cpp +++ b/deps/ox/src/ox/std/memops.cpp @@ -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 { - char *srcBuf = (char*) src; - char *dstBuf = (char*) dest; + auto srcBuf = static_cast(src); + auto dstBuf = static_cast(dest); for (int64_t i = 0; i < size; i++) { - dstBuf[i] = (char) srcBuf[i]; + dstBuf[i] = static_cast(srcBuf[i]); } return dest; } void *ox_memset(void *ptr, int val, int64_t size) noexcept { - char *buf = (char*) ptr; + auto buf = static_cast(ptr); for (int64_t i = 0; i < size; i++) { buf[i] = val; } diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp index 83720dc7..49c3f51d 100644 --- a/deps/ox/src/ox/std/string.hpp +++ b/deps/ox/src/ox/std/string.hpp @@ -96,7 +96,7 @@ constexpr const BString &BString::operator=(const char *str) noexcep template constexpr const BString &BString::operator=(char *str) noexcept { - return *this = (const char*) str; + return *this = static_cast(str); } template @@ -114,7 +114,7 @@ constexpr const BString &BString::operator+=(const char *str) noexce template constexpr const BString &BString::operator+=(char *str) noexcept { - return *this += (const char*) str; + return *this = static_cast(str); } template @@ -155,12 +155,12 @@ constexpr char &BString::operator[](std::size_t i) noexcept { template constexpr char *BString::data() noexcept { - return (char*) m_buff; + return static_cast(m_buff); } template constexpr const char *BString::c_str() const noexcept { - return (const char*) m_buff; + return static_cast(m_buff); } diff --git a/deps/ox/src/ox/std/strops.cpp b/deps/ox/src/ox/std/strops.cpp index 45057d8f..ff68db3c 100644 --- a/deps/ox/src/ox/std/strops.cpp +++ b/deps/ox/src/ox/std/strops.cpp @@ -23,7 +23,8 @@ static_assert([] { static_assert([] { int retval = 0; auto testStr = "aaaa"; - retval |= !(ox_lastIndexOf((char*) testStr, 'a', ox_strlen(testStr)) == 3); - retval |= !(ox_lastIndexOf((const char*) testStr, 'a', ox_strlen(testStr)) == 3); + // test the const and non-const versions of ox_lastIndexOf + retval |= !(ox_lastIndexOf(const_cast(testStr), 'a', ox_strlen(testStr)) == 3); + retval |= !(ox_lastIndexOf(testStr, 'a', ox_strlen(testStr)) == 3); return retval == 0; }(), "ox_lastIndexOf aaaa a");