From 6221e168f8b533d96bdfd396ac1879416a05d857 Mon Sep 17 00:00:00 2001 From: Dario Date: Fri, 10 Jan 2020 19:24:18 +0100 Subject: [PATCH] fix linux compile errors --- src/cpp/model/User.cpp | 2 +- src/cpp/model/table/ModelBase.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cpp/model/User.cpp b/src/cpp/model/User.cpp index 9e07451bd..36622023b 100644 --- a/src/cpp/model/User.cpp +++ b/src/cpp/model/User.cpp @@ -407,7 +407,7 @@ User::User(Poco::AutoPtr ctrl_user) auto hexStringTemp = mm->getFreeMemory(hexSize); //char* hexString = (char*)malloc(hexSize); memset(*hexStringTemp, 0, hexSize); - sodium_bin2hex(*hexStringTemp, hexSize, pubkey, crypto_sign_PUBLICKEYBYTES); + sodium_bin2hex((char*)(*hexStringTemp), hexSize, pubkey, crypto_sign_PUBLICKEYBYTES); mPublicHex = *hexStringTemp; mm->releaseMemory(hexStringTemp); } diff --git a/src/cpp/model/table/ModelBase.h b/src/cpp/model/table/ModelBase.h index 78cbdcdc4..af917f32a 100644 --- a/src/cpp/model/table/ModelBase.h +++ b/src/cpp/model/table/ModelBase.h @@ -139,7 +139,8 @@ namespace model { size_t ModelBase::updateIntoDB(const std::string& fieldName, const T& fieldValue) { auto cm = ConnectionManager::getInstance(); - Poco::Data::Statement update(cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER)); + auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER) + Poco::Data::Statement update(session); if (mID == 0) { addError(new Error("ModelBase::updateIntoDB", "id is zero"));