diff --git a/orm_lib/inc/drogon/orm/SqlBinder.h b/orm_lib/inc/drogon/orm/SqlBinder.h index 282657fb6d..923209e369 100644 --- a/orm_lib/inc/drogon/orm/SqlBinder.h +++ b/orm_lib/inc/drogon/orm/SqlBinder.h @@ -361,22 +361,22 @@ class DROGON_EXPORT SqlBinder : public trantor::NonCopyable // LOG_DEBUG << "ptr callback"; isExceptionPtr_ = true; exceptionPtrCallback_ = std::forward(callback); - return *this; } else { isExceptionPtr_ = false; exceptionCallback_ = std::forward(callback); - return *this; } } - else if constexpr (traits::isSqlCallback) + + if constexpr (traits::isSqlCallback) { callbackHolder_ = std::shared_ptr( new CallbackHolder::type>( std::forward(callback))); - return *this; } + + return *this; } template diff --git a/trantor b/trantor index 5000e2a726..e5d44486b0 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit 5000e2a72687232c8675b28ce86a29ed7d44309e +Subproject commit e5d44486b076e14430e12d56133abf54d64941bf