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/StreamSocket.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/StreamSocket.cpp')
| -rwxr-xr-x | cpp/src/Ice/StreamSocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 5b6d6eb36d1..26562b09f3e 100755 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -402,7 +402,7 @@ StreamSocket::startWrite(Buffer& buf) _write.buf.len = static_cast<DWORD>(packetSize); _write.buf.buf = reinterpret_cast<char*>(&*buf.i); - int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, NULL); + int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR); if(err == SOCKET_ERROR) { if(!wouldBlock()) @@ -465,7 +465,7 @@ StreamSocket::startRead(Buffer& buf) size_t packetSize = getRecvPacketSize(length); _read.buf.len = static_cast<DWORD>(packetSize); _read.buf.buf = reinterpret_cast<char*>(&*buf.i); - int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, NULL); + int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR); if(err == SOCKET_ERROR) { if(!wouldBlock()) |