提交 66134ea4 编写于 作者: 丁劲犇's avatar 丁劲犇 😸

Compaliable for c++ 2001, using NULL instead of null_ptr.

do not use Upper case chars in include filenames, which will cause file not found in unix-lke systems
上级 d329132a
......@@ -68,7 +68,7 @@ void zp_netTransThread::incomingConnection(QObject * threadid,qintptr socketDesc
if (m_bSSLConnection)
{
QSslSocket * psslsock = qobject_cast<QSslSocket *>(sock_client);
assert(psslsock!=nullptr);
assert(psslsock!=NULL);
QString strCerPath = QCoreApplication::applicationDirPath() + "/svr_cert.pem";
QString strPkPath = QCoreApplication::applicationDirPath() + "/svr_privkey.pem";
psslsock->setLocalCertificate(strCerPath);
......
#include "ZP_TcpServer.h"
#include "zp_tcpserver.h"
#include <assert.h>
namespace ZPNetwork{
ZP_TcpServer::ZP_TcpServer(QObject *parent )
......
......@@ -7,7 +7,7 @@ zp_plWorkingThread::zp_plWorkingThread(zp_pipeline * pipl,QObject *parent) :
{
m_bRuning = true;
m_pipeline = pipl;
assert(m_pipeline != nullptr);
assert(m_pipeline != NULL);
m_bBusy = false;
}
......@@ -35,7 +35,7 @@ void zp_plWorkingThread::FetchNewTask(zp_plWorkingThread * obj)
bool bValid = false;
zp_plTaskBase * ptr = this->m_pipeline->popTask(&bValid);
if (bValid==true && ptr!=nullptr)
if (bValid==true && ptr!=NULL)
{
m_bBusy = true;
int res = ptr->run();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册