Merge branch 'master' of https://github.com/daniele77/cli

daniele77 · Jun 29, 2023 · a39d6c1 · a39d6c1
2 parents a0ed100 + 429ecc8
commit a39d6c1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/include/cli/cli.h b/include/cli/cli.h
@@ -362,8 +362,8 @@ namespace cli
         Menu* current;
         std::unique_ptr<Menu> globalScopeMenu;
         std::ostream& out;
-        std::function< void(std::ostream&)> enterAction = []( std::ostream& ){};
-        std::function< void(std::ostream&)> exitAction = []( std::ostream& ){};
+        std::function< void(std::ostream&)> enterAction = []( std::ostream& ) noexcept {};
+        std::function< void(std::ostream&)> exitAction = []( std::ostream& ) noexcept {};
         detail::History history;
         bool exit{ false }; // to prevent the prompt after exit command
     };

diff --git a/include/cli/clifilesession.h b/include/cli/clifilesession.h
@@ -50,7 +50,7 @@ class CliFileSession : public CliSession
         if (!_in.good()) throw std::invalid_argument("istream invalid");
         if (!_out.good()) throw std::invalid_argument("ostream invalid");
         ExitAction(
-            [this](std::ostream&)
+            [this](std::ostream&) noexcept
             {
                 exit = true;
             }

diff --git a/include/cli/detail/server.h b/include/cli/detail/server.h
@@ -125,14 +125,12 @@ class Server
     Server& operator = ( const Server& ) = delete;
 
     Server(typename ASIOLIB::ContextType& ios, unsigned short port) :
-        acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port)),
-        socket(ios)
+        acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port))
     {
         Accept();
     }
     Server(typename ASIOLIB::ContextType& ios, std::string address, unsigned short port) :
-        acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port)),
-        socket(ios)
+        acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port))
     {
         Accept();
     }
@@ -142,16 +140,16 @@ class Server
 private:
     void Accept()
     {
-        acceptor.async_accept(socket, [this](asiolibec::error_code ec)
+        acceptor.async_accept([this](asiolibec::error_code ec, asiolib::ip::tcp::socket socket)
             {
                 if (!ec) CreateSession(std::move(socket))->Start();
                 Accept();
             });
     }
     asiolib::ip::tcp::acceptor acceptor;
-    asiolib::ip::tcp::socket socket;
 };
 
+
 } // namespace detail
 } // namespace cli
 

diff --git a/test/scheduler_test_templates.h b/test/scheduler_test_templates.h
@@ -38,7 +38,7 @@ void SchedulingTest()
 {
     S scheduler;
     bool done = false;
-    scheduler.Post( [&done](){ done = true; } );
+    scheduler.Post( [&done]() noexcept { done = true; } );
     scheduler.ExecOne();
     BOOST_CHECK(done);
 }
@@ -56,7 +56,7 @@ void SameThreadTest()
         {
             postThreadId = this_thread::get_id();
             scheduler.Post( 
-                [&runThreadId]()
+                [&runThreadId]() noexcept
                 { 
                     runThreadId = this_thread::get_id();
                 }

diff --git a/test/test_boostasioscheduler.cpp b/test/test_boostasioscheduler.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(BoostAsioNonOwner)
     detail::BoostAsioLib::ContextType ioc;
     BoostAsioScheduler scheduler(ioc);
     bool done = false;
-    scheduler.Post( [&done](){ done = true; } );
+    scheduler.Post( [&done]() noexcept { done = true; } );
     ioc.run_one();
     BOOST_CHECK(done);
 }

diff --git a/test/test_cli.cpp b/test/test_cli.cpp
@@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE(EnterActions)
     bool enterActionDone = false;
 
     cli.EnterAction(
-        [&enterActionDone](std::ostream &) { enterActionDone = true; });
+        [&enterActionDone](std::ostream &) noexcept { enterActionDone = true; });
 
     stringstream oss;
 
@@ -401,7 +401,7 @@ BOOST_AUTO_TEST_CASE(ExitActions)
 
     Cli cli(move(rootMenu));
     bool exitActionDone = false;
-    cli.ExitAction([&](std::ostream&){ exitActionDone=true; });
+    cli.ExitAction([&](std::ostream&) noexcept { exitActionDone=true; });
 
     stringstream oss;
 
@@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE(Exceptions)
 
     // std exception type, custom handler
     bool excActionDone = false;
-    cli.StdExceptionHandler( [&](std::ostream&, const std::string&, const std::exception&){ excActionDone = true; } );
+    cli.StdExceptionHandler( [&](std::ostream&, const std::string&, const std::exception&) noexcept { excActionDone = true; } );
     BOOST_CHECK_NO_THROW( UserInput(cli, oss, "stdexception") );
     BOOST_CHECK(excActionDone);
 

diff --git a/test/test_standaloneasioscheduler.cpp b/test/test_standaloneasioscheduler.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(StandaloneAsioNonOwner)
     detail::StandaloneAsioLib::ContextType ioc;
     StandaloneAsioScheduler scheduler(ioc);
     bool done = false;
-    scheduler.Post( [&done](){ done = true; } );
+    scheduler.Post( [&done]() noexcept { done = true; } );
     ioc.run_one();
     BOOST_CHECK(done);
 }