From c4e66a102a818404e70ee38fcc25653a60a8c96c Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 1 Jul 2018 02:20:03 +0000 Subject: [PATCH] fixed part of code left out in the previous commit --- qse/include/qse/si/TcpServer.hpp | 4 ++-- qse/include/qse/si/Thread.hpp | 2 +- qse/samples/si/tcpsvr01.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qse/include/qse/si/TcpServer.hpp b/qse/include/qse/si/TcpServer.hpp index b9dc223a..69f8da2d 100644 --- a/qse/include/qse/si/TcpServer.hpp +++ b/qse/include/qse/si/TcpServer.hpp @@ -204,10 +204,10 @@ template class TcpServerL: public TcpServer { public: - TcpServerL (Mmgr* mmgr = QSE_NULL) QSE_CPP_NOEXCEPT: Mmgr(mmgr), __lfunc(nullptr) {} + TcpServerL (Mmgr* mmgr = QSE_NULL) QSE_CPP_NOEXCEPT: TcpServer(mmgr), __lfunc(nullptr) {} template - TcpServerL (T&& f, Mmgr* mmgr = QSE_NULL) QSE_CPP_NOEXCEPT: Mmgr(mmgr), __lfunc(nullptr) + TcpServerL (T&& f, Mmgr* mmgr = QSE_NULL) QSE_CPP_NOEXCEPT: TcpServer(mmgr), __lfunc(nullptr) { try { diff --git a/qse/include/qse/si/Thread.hpp b/qse/include/qse/si/Thread.hpp index 0fa22d60..1e01ee34 100644 --- a/qse/include/qse/si/Thread.hpp +++ b/qse/include/qse/si/Thread.hpp @@ -182,7 +182,7 @@ public: int start (T&& f, int flags) QSE_CPP_NOEXCEPT //int start (T f, int flags) QSE_CPP_NOEXCEPT { - if (this->__state == QSE_THR_RUNNING) return -1; + if (this->thr.__state == QSE_THR_RUNNING) return -1; if (this->__lfunc) this->getMmgr()->dispose (this->__lfunc); //delete this->__lfunc; try { diff --git a/qse/samples/si/tcpsvr01.cpp b/qse/samples/si/tcpsvr01.cpp index 9dfe66d0..b31fc413 100644 --- a/qse/samples/si/tcpsvr01.cpp +++ b/qse/samples/si/tcpsvr01.cpp @@ -77,7 +77,9 @@ static int test1 (void) qse_printf (QSE_T("byte to %s\n"), addrbuf); return 0; - }) + }), + + &heap_mmgr ); #else