Add support for union, enum, class/union template

1 files changed, 6 insertions, 14 deletions

diff --git a/odb/semantics/class.hxx b/odb/semantics/class.hxx
index d4a0900..bbe4687 100644
--- a/odb/semantics/class.hxx
+++ b/odb/semantics/class.hxx
@@ -13,19 +13,6 @@ namespace semantics
 {
   class class_;
 
-  //
-  //
-  class data_member: public nameable, public instance
-  {
-  public:
-    data_member (path const& file, size_t line, size_t column)
-        : node (file, line, column)
-    {
-    }
-  };
-
-  //
-  //
   class inherits: public edge
   {
   public:
@@ -83,7 +70,7 @@ namespace semantics
 
   //
   //
-  class class_: public type, public scope
+  class class_: public virtual type, public scope
   {
   private:
     typedef std::vector<inherits*> inherits_list;
@@ -127,6 +114,11 @@ namespace semantics
     //
     using nameable::scope;
 
+  protected:
+    class_ ()
+    {
+    }
+
   private:
     inherits_list inherits_;
   };