[commit] r2732 - trunk/GME/ConstraintManager

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Feb  5 11:27:59 2018
New Revision: 2732

Log:
Remove useless typedefs

Modified:
   trunk/GME/ConstraintManager/GMEConstraintEx.h
   trunk/GME/ConstraintManager/OCLContext.h
   trunk/GME/ConstraintManager/OCLTree.h
   trunk/GME/ConstraintManager/OclConstraint.h

Modified: trunk/GME/ConstraintManager/GMEConstraintEx.h
==============================================================================
--- trunk/GME/ConstraintManager/GMEConstraintEx.h	Mon Feb  5 11:27:54 2018	(r2731)
+++ trunk/GME/ConstraintManager/GMEConstraintEx.h	Mon Feb  5 11:27:59 2018	(r2732)
@@ -43,8 +43,8 @@
 		: public Ocl::Constraint
 	{
 		public :
-			typedef enum Type { CT_CRITICAL_META = 0, CT_NON_CRITICAL_META = 1, CT_CRITICAL_USER = 2, CT_NON_CRITICAL_USER = 3, CT_CRITICAL_LIBRARY = 4, CT_NON_CRITICAL_LIBRARY = 5, CT_ATTRIBUTE_META = 6, CT_ATTRIBUTE_USER = 7, CT_METHOD_META = 8, CT_METHOD_USER = 9 };
-			typedef enum Location { CL_META = 0, CL_PROJECT = 1, CL_LIBRARY };
+			enum Type { CT_CRITICAL_META = 0, CT_NON_CRITICAL_META = 1, CT_CRITICAL_USER = 2, CT_NON_CRITICAL_USER = 3, CT_CRITICAL_LIBRARY = 4, CT_NON_CRITICAL_LIBRARY = 5, CT_ATTRIBUTE_META = 6, CT_ATTRIBUTE_USER = 7, CT_METHOD_META = 8, CT_METHOD_USER = 9 };
+			enum Location { CL_META = 0, CL_PROJECT = 1, CL_LIBRARY };
 
 		private :
 			Type							m_eType;
@@ -82,7 +82,7 @@
 		: public ConstraintBase, public OclCommon::ReferenceCountable< Constraint >
 	{
 		public :
-			typedef enum EnableInfo { CE_NONE = 0, CE_ENABLED = 1, CE_ENABLED_INHERITED = 2, CE_ENABLED_READONLY = 3, CE_DISABLED = 4, CE_DISABLED_INHERITED = 5, CE_DISABLED_READONLY = 6 };
+			enum EnableInfo { CE_NONE = 0, CE_ENABLED = 1, CE_ENABLED_INHERITED = 2, CE_ENABLED_READONLY = 3, CE_DISABLED = 4, CE_DISABLED_INHERITED = 5, CE_DISABLED_READONLY = 6 };
 
 		private :
 			unsigned long 					m_ulEventMask;

Modified: trunk/GME/ConstraintManager/OCLContext.h
==============================================================================
--- trunk/GME/ConstraintManager/OCLContext.h	Mon Feb  5 11:27:54 2018	(r2731)
+++ trunk/GME/ConstraintManager/OCLContext.h	Mon Feb  5 11:27:59 2018	(r2732)
@@ -71,7 +71,7 @@
 
 
 		private :
-			typedef struct StoreItem{ TItem object; bool bAssignable; };
+			struct StoreItem{ TItem object; bool bAssignable; };
 			typedef std::map< std::string, StoreItem > TMap;
 
 		private :

Modified: trunk/GME/ConstraintManager/OCLTree.h
==============================================================================
--- trunk/GME/ConstraintManager/OCLTree.h	Mon Feb  5 11:27:54 2018	(r2731)
+++ trunk/GME/ConstraintManager/OCLTree.h	Mon Feb  5 11:27:59 2018	(r2732)
@@ -126,7 +126,7 @@
 
 	class TreeNode
 	{
-		public :	typedef enum NodeKind { NK_OBJECT = 0, NK_COLLECTION = 1, NK_DECLARATION = 2,  NK_VARIABLE = 3, NK_IFTHENELSE = 4, NK_OPERATOR = 5, NK_FUNCTION = 6, NK_ATTRIBUTE = 7, NK_ASSOCIATION = 8, NK_METHOD = 9,  NK_ITERATOR = 10, NK_CONTEXT = 11, NK_TYPECAST = 12, NK_CONSTRAINT = 13, NK_EXTENSION = 14 };
+		public :	enum NodeKind { NK_OBJECT = 0, NK_COLLECTION = 1, NK_DECLARATION = 2,  NK_VARIABLE = 3, NK_IFTHENELSE = 4, NK_OPERATOR = 5, NK_FUNCTION = 6, NK_ATTRIBUTE = 7, NK_ASSOCIATION = 8, NK_METHOD = 9,  NK_ITERATOR = 10, NK_CONTEXT = 11, NK_TYPECAST = 12, NK_CONSTRAINT = 13, NK_EXTENSION = 14 };
 
 		private : 				TreeManager* 	m_pManager;
 						const 	NodeKind			m_eKind;

Modified: trunk/GME/ConstraintManager/OclConstraint.h
==============================================================================
--- trunk/GME/ConstraintManager/OclConstraint.h	Mon Feb  5 11:27:54 2018	(r2731)
+++ trunk/GME/ConstraintManager/OclConstraint.h	Mon Feb  5 11:27:59 2018	(r2732)
@@ -27,7 +27,7 @@
 	class Constraint
 	{
 		public :
-			typedef enum State
+			enum State
 				{
 					CS_UNREGISTERED = 0,
 					CS_REGISTERED = 1,
@@ -46,7 +46,7 @@
 					CS_EVAL_SUCCEEDED = 14
 				};
 
-			typedef enum Stereotype
+			enum Stereotype
 				{
 					CS_INVARIANT = 20,
 					CS_PRECONDITION = 21,