diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
| commit | 05485a47ea107737ada8b0941a7a066c6a075f40 (patch) | |
| tree | 8bf8a5fee750b20a631f02f60e6db21788ecc14f /cpp/src/IceUtil/StringUtil.cpp | |
| parent | Moved UniquePtr to IceInternal (diff) | |
| download | ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.bz2 ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.xz ice-05485a47ea107737ada8b0941a7a066c6a075f40.zip | |
Replace NULL by ICE_NULLPTR
Diffstat (limited to 'cpp/src/IceUtil/StringUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 6c87d8d7148..5ed73e29faf 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -826,13 +826,13 @@ IceUtilInternal::errorToString(int error, LPCVOID source) stored = FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | - (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0), + (source != ICE_NULLPTR ? FORMAT_MESSAGE_FROM_HMODULE : 0), source, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language const_cast<wchar_t*>(lpMsgBuf.data()), static_cast<int>(lpMsgBuf.size()), - NULL); + ICE_NULLPTR); if(stored == 0) { @@ -864,13 +864,13 @@ IceUtilInternal::errorToString(int error, LPCVOID source) FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | - (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0), + (source != ICE_NULLPTR ? FORMAT_MESSAGE_FROM_HMODULE : 0), source, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language reinterpret_cast<LPWSTR>(&msg), 0, - NULL); + ICE_NULLPTR); #endif if(stored > 0) |