Regen SMUX support library with more recent ASN1 compiler.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_users.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
index b9d5fce464392d42a21e4fb60b37111d1b4298c0..d1e36e8f79df0983c161b0d4ec031287c6f169d4 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
@@ -26,17 +26,17 @@
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/common.h"
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/common.h"

-#include "stg/optional.h"

 
 #include <string>
 
 #include <string>

+#include <optional>

 
 namespace STG
 {
 
 
 namespace STG
 {
 

-struct Users;
-struct User;
-struct Tariffs;
-struct Admin;
+class Users;
+class User;
+class Tariffs;
+class Admin;

 struct Store;
 
 namespace PARSER
 struct Store;
 
 namespace PARSER


@@ -160,8 +160,8 @@ class CHG_USER: public BASE_PARSER
         const Tariffs & m_tariffs;
         UserStatOpt m_usr;
         UserConfOpt m_ucr;
         const Tariffs & m_tariffs;
         UserStatOpt m_usr;
         UserConfOpt m_ucr;

-        Optional<uint64_t> m_upr[DIR_NUM];
-        Optional<uint64_t> m_downr[DIR_NUM];
+        std::optional<uint64_t> m_upr[DIR_NUM];
+        std::optional<uint64_t> m_downr[DIR_NUM];

         std::string m_cashMsg;
         std::string m_login;
         bool m_cashMustBeAdded;
         std::string m_cashMsg;
         std::string m_login;
         bool m_cashMustBeAdded;