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/Ice/TcpAcceptor.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/Ice/TcpAcceptor.cpp')
| -rwxr-xr-x | cpp/src/Ice/TcpAcceptor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index e601c3418db..3af1acbe40a 100755 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -105,7 +105,7 @@ IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation) void IceInternal::TcpAcceptor::startAccept() { - LPFN_ACCEPTEX AcceptEx = NULL; // a pointer to the 'AcceptEx()' function + LPFN_ACCEPTEX AcceptEx = ICE_NULLPTR; // a pointer to the 'AcceptEx()' function GUID GuidAcceptEx = WSAID_ACCEPTEX; // The Guid DWORD dwBytes; if(WSAIoctl(_fd, @@ -115,8 +115,8 @@ IceInternal::TcpAcceptor::startAccept() &AcceptEx, sizeof(AcceptEx), &dwBytes, - NULL, - NULL) == SOCKET_ERROR) + ICE_NULLPTR, + ICE_NULLPTR) == SOCKET_ERROR) { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); |