Release-1.7.4-20110606

1 files changed, 25 insertions, 22 deletions

diff --git a/src/entry.h b/src/entry.h
index 6f1e2e4..ddb2017 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -239,28 +239,31 @@ class Entry
     };
     enum MemberSpecifier
     {
-      Inline    = 0x000001,
-      Explicit  = 0x000002,
-      Mutable   = 0x000004,
-      Settable  = 0x000008,
-      Gettable  = 0x000010,
-      Readable  = 0x000020,
-      Writable  = 0x000040,
-      Final     = 0x000080,
-      Abstract  = 0x000100,
-      Addable   = 0x000200,
-      Removable = 0x000400,
-      Raisable  = 0x000800,
-      Override  = 0x001000,
-      New       = 0x002000,
-      Sealed    = 0x004000,
-      Initonly  = 0x008000,
-      Optional  = 0x010000,
-      Required  = 0x020000,
-      NonAtomic = 0x040000,
-      Copy      = 0x080000,
-      Retain    = 0x100000,
-      Assign    = 0x200000
+      Inline      = 0x00000001,
+      Explicit    = 0x00000002,
+      Mutable     = 0x00000004,
+      Settable    = 0x00000008,
+      Gettable    = 0x00000010,
+      Readable    = 0x00000020,
+      Writable    = 0x00000040,
+      Final       = 0x00000080,
+      Abstract    = 0x00000100,
+      Addable     = 0x00000200,
+      Removable   = 0x00000400,
+      Raisable    = 0x00000800,
+      Override    = 0x00001000,
+      New         = 0x00002000,
+      Sealed      = 0x00004000,
+      Initonly    = 0x00008000,
+      Optional    = 0x00010000,
+      Required    = 0x00020000,
+      NonAtomic   = 0x00040000,
+      Copy        = 0x00080000,
+      Retain      = 0x00100000,
+      Assign      = 0x00200000,
+      Composition = 0x00400000,
+      Aggregation = 0x00800000,
+      Association = 0x01000000
     };
     enum ClassSpecifier
     {