actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ezsockets.cpp
+4 -4
View File
@@ -269,7 +269,7 @@ bool EzSockets::connect(const std::string& host, unsigned short port)
struct hostent* phe;
phe = gethostbyname(host.c_str());
if (phe == NULL)
if (phe == nullptr)
{
return false;
}
@@ -295,7 +295,7 @@ inline bool checkCanRead(int sock, timeval& timeout)
FD_ZERO(&fds);
FD_SET((unsigned)sock, &fds);
return select(sock+1, &fds, NULL, NULL, &timeout) > 0;
return select(sock+1, &fds, nullptr, nullptr, &timeout) > 0;
}
bool EzSockets::CanRead()
@@ -320,7 +320,7 @@ bool EzSockets::IsError()
FD_ZERO(data->scks);
FD_SET((unsigned)data->sock, data->scks);
if (select(data->sock+1, NULL, NULL, data->scks, data->times) >=0 )
if (select(data->sock+1, nullptr, nullptr, data->scks, data->times) >=0 )
return false;
state = skERROR;
@@ -333,7 +333,7 @@ inline bool checkCanWrite(int sock, timeval& timeout)
FD_ZERO(&fds);
FD_SET((unsigned)sock, &fds);
return select(sock+1, NULL, &fds, NULL, &timeout) > 0;
return select(sock+1, nullptr, &fds, nullptr, &timeout) > 0;
}
bool EzSockets::CanWrite()