none

OpenArkStudio · Apr 29, 2021 · d943550 · d943550
1 parent f61d57c
commit d943550
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/include/bsio/base/WaitGroup.hpp b/include/bsio/base/WaitGroup.hpp
@@ -44,26 +44,21 @@ class WaitGroup
     }
 
     template<class Rep, class Period>
-    void wait(const std::chrono::duration<Rep, Period>& timeout)
+    auto wait(const std::chrono::duration<Rep, Period>& timeout)
     {
         std::unique_lock<std::mutex> l(mMutex);
-        mCond.wait_for(l, timeout, [&] {
+        return mCond.wait_for(l, timeout, [&] {
             return mCounter <= 0;
         });
     }
 
 private:
-    WaitGroup()
-        : mCounter(0)
-    {
-    }
-
     virtual ~WaitGroup() = default;
 
 private:
     std::mutex mMutex;
-    std::atomic<int> mCounter;
+    std::atomic<int> mCounter = {0};
     std::condition_variable mCond;
 };
 
-}}// namespace bsio::base
+}}// namespace bsio::base
diff --git a/include/bsio/net/TcpAcceptor.hpp b/include/bsio/net/TcpAcceptor.hpp
@@ -70,10 +70,9 @@ class TcpAcceptor : public asio::noncopyable,
 
         auto& ioContext = mIoContextThreadPool->pickIoContext();
         auto sharedSocket = SharedSocket::Make(asio::ip::tcp::socket(ioContext), ioContext);
-        const auto self = shared_from_this();
         mAcceptor.async_accept(
                 sharedSocket->socket(),
-                [self, callback, sharedSocket, this](std::error_code ec) mutable {
+                [self = shared_from_this(), this, callback, sharedSocket](std::error_code ec) mutable {
                     if (!ec)
                     {
                         sharedSocket->context().post([=]() {