Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use nullptr to clear std::function objects

This commit is contained in:
antao 2019-02-21 15:46:54 +08:00
parent aab31ba64e
commit 15ab5e1558
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orm_lib/src/mysql_impl/MysqlConnection.cc
View File

@ -434,10 +434,10 @@ void MysqlConnection::outputError()
catch (...)
{
_exceptCb(std::current_exception());
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
_isWorking = false;
if (_idleCbPtr)
{
@ -457,8 +457,8 @@ void MysqlConnection::getResult(MYSQL_RES *res)
if (_isWorking)
{
_cb(Result);
_cb = decltype(_cb)();
_exceptCb = decltype(_exceptCb)();
_cb = nullptr;
_exceptCb = nullptr;
_isWorking = false;
if (_idleCbPtr)
{

30
orm_lib/src/postgresql_impl/PgConnection.cc
View File

@ -197,9 +197,9 @@ void PgConnection::execSqlInLoop(std::string &&sql,
{
auto exceptPtr = std::current_exception();
_exceptCb(exceptPtr);
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
if (_idleCbPtr)
{
auto idle = std::move(_idleCbPtr);
@ -237,9 +237,9 @@ void PgConnection::execSqlInLoop(std::string &&sql,
{
auto exceptPtr = std::current_exception();
_exceptCb(exceptPtr);
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
if (_idleCbPtr)
{
auto idle = std::move(_idleCbPtr);
@ -268,9 +268,9 @@ void PgConnection::execSqlInLoop(std::string &&sql,
{
auto exceptPtr = std::current_exception();
_exceptCb(exceptPtr);
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
if (_idleCbPtr)
{
auto idle = std::move(_idleCbPtr);
@ -312,9 +312,9 @@ void PgConnection::execSqlInLoop(std::string &&sql,
{
auto exceptPtr = std::current_exception();
thisPtr->_exceptCb(exceptPtr);
thisPtr->_exceptCb = decltype(thisPtr->_exceptCb)();
thisPtr->_exceptCb = nullptr;
}
thisPtr->_cb = decltype(thisPtr->_cb)();
thisPtr->_cb = nullptr;
if (thisPtr->_idleCbPtr)
{
auto idle = std::move(thisPtr->_idleCbPtr);
@ -349,9 +349,9 @@ void PgConnection::handleRead()
{
auto exceptPtr = std::current_exception();
_exceptCb(exceptPtr);
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
if (_idleCbPtr)
{
//auto idle = std::move(_idleCbPtr);
@ -388,9 +388,9 @@ void PgConnection::handleRead()
catch (...)
{
_exceptCb(std::current_exception());
_exceptCb = decltype(_exceptCb)();
_exceptCb = nullptr;
}
_cb = decltype(_cb)();
_cb = nullptr;
}
}
else
@ -405,8 +405,8 @@ void PgConnection::handleRead()
{
auto r = makeResult(res, _sql);
_cb(r);
_cb = decltype(_cb)();
_exceptCb = decltype(_exceptCb)();
_cb = nullptr;
_exceptCb = nullptr;
}
}
}
@ -416,7 +416,7 @@ void PgConnection::handleRead()
if (isPreparing)
{
_preparingCallback();
_preparingCallback = std::function<void()>();
_preparingCallback = nullptr;
}
else
{