diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-05-02 09:50:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 09:50:36 +0200 |
commit | a4dbb5c58270959884c17d720185da06464fa256 (patch) | |
tree | 2b4e81410e90e059f51726e6c9a01c03fcbfb98d /src/OSSupport | |
parent | tolua++ bindings use nullptr. (#4219) (diff) | |
download | cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.gz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.bz2 cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.lz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.xz cuberite-a4dbb5c58270959884c17d720185da06464fa256.tar.zst cuberite-a4dbb5c58270959884c17d720185da06464fa256.zip |
Diffstat (limited to 'src/OSSupport')
-rw-r--r-- | src/OSSupport/File.cpp | 2 | ||||
-rw-r--r-- | src/OSSupport/NetworkSingleton.cpp | 2 | ||||
-rw-r--r-- | src/OSSupport/ServerHandleImpl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 8b91cc2a4..bb33dc732 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -285,7 +285,7 @@ int cFile::ReadRestOfFile(AString & a_Contents) // HACK: This depends on the internal knowledge that AString's data() function returns the internal buffer directly a_Contents.assign(DataSize, '\0'); - return Read(reinterpret_cast<void *>(const_cast<char *>(a_Contents.data())), DataSize); + return Read(static_cast<void *>(const_cast<char *>(a_Contents.data())), DataSize); } diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp index 2f7ed3802..f855acdc1 100644 --- a/src/OSSupport/NetworkSingleton.cpp +++ b/src/OSSupport/NetworkSingleton.cpp @@ -173,7 +173,7 @@ void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self) void cNetworkSingleton::SignalizeStartup(evutil_socket_t a_Socket, short a_Events, void * a_Self) { - auto self = reinterpret_cast<cNetworkSingleton *>(a_Self); + auto self = static_cast<cNetworkSingleton *>(a_Self); ASSERT(self != nullptr); self->m_StartupEvent.Set(); } diff --git a/src/OSSupport/ServerHandleImpl.cpp b/src/OSSupport/ServerHandleImpl.cpp index d1443757a..562b2f902 100644 --- a/src/OSSupport/ServerHandleImpl.cpp +++ b/src/OSSupport/ServerHandleImpl.cpp @@ -284,7 +284,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port) void cServerHandleImpl::Callback(evconnlistener * a_Listener, evutil_socket_t a_Socket, sockaddr * a_Addr, int a_Len, void * a_Self) { // Cast to true self: - cServerHandleImpl * Self = reinterpret_cast<cServerHandleImpl *>(a_Self); + cServerHandleImpl * Self = static_cast<cServerHandleImpl *>(a_Self); ASSERT(Self != nullptr); ASSERT(Self->m_SelfPtr != nullptr); |