Index: src/libchcore/TSharedMemory.cpp =================================================================== diff -u -N -re8f31b0f922b402878356e130c866c4f3682a7f5 -r8068e0c351055554340ac9755d1bc846893bf2b8 --- src/libchcore/TSharedMemory.cpp (.../TSharedMemory.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5) +++ src/libchcore/TSharedMemory.cpp (.../TSharedMemory.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) @@ -58,9 +58,9 @@ // TSharedMemory class TSharedMemory::TSharedMemory() : - m_hFileMapping(NULL), - m_pMappedMemory(NULL), - m_hMutex(NULL), + m_hFileMapping(nullptr), + m_pMappedMemory(nullptr), + m_hMutex(nullptr), m_stSize(0) { } @@ -171,20 +171,20 @@ if (m_hMutex) { CloseHandle(m_hMutex); - m_hMutex = NULL; + m_hMutex = nullptr; } if (m_pMappedMemory) { UnmapViewOfFile(m_pMappedMemory); - m_pMappedMemory = NULL; + m_pMappedMemory = nullptr; } // Close the process's handle to the file-mapping object. if (m_hFileMapping) { CloseHandle(m_hFileMapping); - m_hFileMapping = NULL; + m_hFileMapping = nullptr; } } catch (...) @@ -231,15 +231,15 @@ const BYTE* TSharedMemory::GetData() const { if (!m_hFileMapping || !m_pMappedMemory || m_stSize <= sizeof(shm_size_t)) - return NULL; + return nullptr; return (BYTE*)m_pMappedMemory + sizeof(shm_size_t); } BYTE* TSharedMemory::GetData() { if (!m_hFileMapping || !m_pMappedMemory || m_stSize <= sizeof(shm_size_t)) - return NULL; + return nullptr; return (BYTE*)m_pMappedMemory + sizeof(shm_size_t); }