From e23bd1552448f444ca0f97fcfd5c68016b2e7eb6 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Thu, 20 Mar 2025 20:39:19 +0800 Subject: Revert "fix: use shared ptr properly" This reverts commit 5c007b1581e7c36ce81de299e47c0c9ef51e9950. revert until a solution is developed --- src/chatServer.cpp | 2 +- src/sessionManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chatServer.cpp b/src/chatServer.cpp index 8605c75..8e9a3ab 100644 --- a/src/chatServer.cpp +++ b/src/chatServer.cpp @@ -39,7 +39,7 @@ void CChatServer::start() { initManagers(); // will await while waiting for accept() to return a new client - m_sessionManagerThread = std::jthread(&CSessionManager::run, g_pSessionManager); + m_sessionManagerThread = std::jthread(&CSessionManager::run, g_pSessionManager.get()); m_sessionManagerThread.detach(); while (true) { diff --git a/src/sessionManager.cpp b/src/sessionManager.cpp index c62402c..435c6dc 100644 --- a/src/sessionManager.cpp +++ b/src/sessionManager.cpp @@ -29,7 +29,7 @@ CSessionManager::~CSessionManager() { std::pair> *CSessionManager::newSession() { std::shared_ptr session = std::make_shared(); - const auto instance = &m_vSessions.emplace_back(std::jthread(&CSession::run, session), session); + const auto instance = &m_vSessions.emplace_back(std::jthread(&CSession::run, session.get()), session); instance->second->setSelf(instance); return instance; } -- cgit v1.2.3