Use std::jthread and C++17.

[stg.git] / projects / sgconf / info.cpp

diff --git a/projects/sgconf/info.cpp b/projects/sgconf/info.cpp
index 0e98d3dcb81b80515eddab92bba7ca5944a396fb..421e438900e3ae44db218015a02db9f85e1d5233 100644 (file)
--- a/projects/sgconf/info.cpp
+++ b/projects/sgconf/info.cpp
@@ -15,7 +15,7 @@
 namespace
 {
 
 namespace
 {
 

-void PrintInfo(const STG::SERVER_INFO::INFO& info)
+void PrintInfo(const STG::ServerInfo::Info& info)

 {
     std::cout << "Server version: '" << info.version << "'\n"
               << "Number of tariffs: " << info.tariffNum << "\n"
 {
     std::cout << "Server version: '" << info.version << "'\n"
               << "Number of tariffs: " << info.tariffNum << "\n"


@@ -28,7 +28,7 @@ void PrintInfo(const STG::SERVER_INFO::INFO& info)
         std::cout << "\t - '" << info.dirName[i] << "'\n";
 }
 
         std::cout << "\t - '" << info.dirName[i] << "'\n";
 }
 

-void InfoCallback(bool result, const std::string & reason, const STG::SERVER_INFO::INFO & info, void * /*data*/)
+void InfoCallback(bool result, const std::string & reason, const STG::ServerInfo::Info & info, void * /*data*/)

 {
 if (!result)
     {
 {
 if (!result)
     {


@@ -42,7 +42,7 @@ bool InfoFunction(const SGCONF::CONFIG & config,
                   const std::string& /*arg*/,
                   const std::map<std::string, std::string> & /*options*/)
 {
                   const std::string& /*arg*/,
                   const std::map<std::string, std::string> & /*options*/)
 {

-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),

                     config.port.data(),
                     config.localAddress.data(),
                     config.localPort.data(),
                     config.port.data(),
                     config.localAddress.data(),
                     config.localPort.data(),