Переглянути джерело

HPCC-16366 Define enums with size

- Reduce dependencies by allowing forward declaration of enums

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 8 роки тому
батько
коміт
6d92d49b71
2 змінених файлів з 10 додано та 9 видалено
  1. 2 1
      dali/base/dasess.hpp
  2. 8 8
      system/security/shared/seclib.hpp

+ 2 - 1
dali/base/dasess.hpp

@@ -27,7 +27,6 @@
 #endif
 
 #include "dacoven.hpp"
-#include "seclib.hpp"
 
 typedef DALI_UID SessionId;
 typedef DALI_UID SubscriptionId;
@@ -90,6 +89,8 @@ interface ISessionNotify: extends IInterface
     virtual void aborted(SessionId id) = 0;
 };
 
+enum SecAccessFlags : int;
+
 interface ISessionManager: extends IInterface
 {
     virtual SessionId startSession(SecurityToken tok, SessionId parentid =-1) = 0;

+ 8 - 8
system/security/shared/seclib.hpp

@@ -37,7 +37,7 @@
 #define SECLIB "seclib"
 #define LDAPSECLIB "LdapSecurity"
 
-enum NewSecAccessFlags
+enum NewSecAccessFlags : int
 {
     NewSecAccess_None = 0,
     NewSecAccess_Access = 1,
@@ -48,7 +48,7 @@ enum NewSecAccessFlags
 
 
 
-enum SecAccessFlags
+enum SecAccessFlags : int
 {
     SecAccess_Unavailable = -1,
     SecAccess_Unknown = -255,
@@ -83,7 +83,7 @@ static const char * getSecAccessFlagName(SecAccessFlags flag)
 }
 
 
-enum SecResourceType
+enum SecResourceType : int
 {
     RT_DEFAULT = 0,
     RT_MODULE = 1,
@@ -100,7 +100,7 @@ enum SecResourceType
 
 const char* resTypeDesc(SecResourceType type);
 
-enum SecPermissionType
+enum SecPermissionType : int
 {
     PT_DEFAULT = 0,
     PT_ADMINISTRATORS_ONLY = 1,
@@ -111,7 +111,7 @@ enum SecPermissionType
 
 #define DEFAULT_REQUIRED_ACCESS SecAccess_Read
 
-enum SecPasswordEncoding
+enum SecPasswordEncoding : int
 {
     SecPwEnc_unknown = 0,
     SecPwEnc_plain_text = 1,
@@ -123,7 +123,7 @@ enum SecPasswordEncoding
 
 
  
-enum SecUserStatus
+enum SecUserStatus : int
 {
     SecUserStatus_Inhouse = 0,
     SecUserStatus_Active = 1,
@@ -153,7 +153,7 @@ interface ISecCredentials : extends IInterface
 };
 
 //LDAP authentication status
-enum authStatus
+enum authStatus : int
 {
     AS_AUTHENTICATED = 0,
     AS_UNKNOWN = 1,//have not attempted to authenticate
@@ -284,7 +284,7 @@ interface IAuthMap : extends IInterface
     virtual ISecResourceList * getResourceList(const char * path) = 0;
 };
 
-enum secManagerType
+enum secManagerType : int
 {
     SMT_New,
     SMT_Default,