Merge remote-tracking branch 'github/master'

[stg.git] / include / stg / users.h

diff --git a/include/stg/users.h b/include/stg/users.h
index a8d4eb60518331785718bbf9f1a59e49ac194088..a0be84931d1437c2f33ed9d3d4d29a197f15fccb 100644 (file)
--- a/include/stg/users.h
+++ b/include/stg/users.h
@@ -24,11 +24,13 @@
 
 #include <string>
 
 
 #include <string>
 

+#include <cstdint>
+

 namespace STG
 {
 
 namespace STG
 {
 

-struct Admin;
-struct User;
+class Admin;
+class User;

 struct Auth;
 
 class Users
 struct Auth;
 
 class Users


@@ -46,9 +48,9 @@ class Users
         virtual bool TariffInUse(const std::string& tariffName) const = 0;
 
         template <typename F>
         virtual bool TariffInUse(const std::string& tariffName) const = 0;
 
         template <typename F>

-        auto onUserAdd(F&& f) { return m_onAddCallbacks.add(std::forward<F>(f)); }
+        auto onAdd(F&& f) { return m_onAddCallbacks.add(std::forward<F>(f)); }

         template <typename F>
         template <typename F>

-        auto onUserDel(F&& f) { return m_onDelCallbacks.add(std::forward<F>(f)); }
+        auto onDel(F&& f) { return m_onDelCallbacks.add(std::forward<F>(f)); }

 
         virtual int  Add(const std::string& login, const Admin* admin) = 0;
         virtual void Del(const std::string& login, const Admin* admin) = 0;
 
         virtual int  Add(const std::string& login, const Admin* admin) = 0;
         virtual void Del(const std::string& login, const Admin* admin) = 0;