More jthreads.

[stg.git] / projects / sgconf / config.h

diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h
index d3659a1d343423884b58fc32ef367d8e7a6f1af1..f5313ef987a8a97c2c949762194b9e9483d5a095 100644 (file)
--- a/projects/sgconf/config.h
+++ b/projects/sgconf/config.h
@@ -18,28 +18,27 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_SGCONF_CONFIG_H__
-#define __STG_SGCONF_CONFIG_H__
+#pragma once
 
 #include "stg/common.h"
-#include "stg/resetable.h"
-#include "stg/os_int.h"
+#include "stg/optional.h"
 
 #include <string>
+#include <cstdint>
 
 namespace SGCONF
 {
 
 struct CONFIG
 {
-    RESETABLE<std::string> configFile;
-    RESETABLE<std::string> server;
-    RESETABLE<uint16_t> port;
-    RESETABLE<std::string> localAddress;
-    RESETABLE<uint16_t> localPort;
-    RESETABLE<std::string> userName;
-    RESETABLE<std::string> userPass;
-    RESETABLE<bool> showConfig;
+    STG::Optional<std::string> configFile;
+    STG::Optional<std::string> server;
+    STG::Optional<uint16_t> port;
+    STG::Optional<std::string> localAddress;
+    STG::Optional<uint16_t> localPort;
+    STG::Optional<std::string> userName;
+    STG::Optional<std::string> userPass;
+    STG::Optional<bool> showConfig;
 
     CONFIG & operator=(const CONFIG & rhs)
     {
@@ -70,11 +69,11 @@ struct CONFIG
     if (!server.empty())
         res += "server: '" + server.data() + "'\n";
     if (!port.empty())
-        res += "port: " + x2str(port.data()) + "\n";
+        res += "port: " + std::to_string(port.data()) + "\n";
     if (!localAddress.empty())
         res += "local address: '" + localAddress.data() + "'\n";
     if (!localPort.empty())
-        res += "local port: " + x2str(localPort.data()) + "\n";
+        res += "local port: " + std::to_string(localPort.data()) + "\n";
     if (!userName.empty())
         res += "userName: '" + userName.data() + "'\n";
     if (!userPass.empty())
@@ -84,5 +83,3 @@ struct CONFIG
 };
 
 } // namespace SGCONF
-
-#endif