1 files changed, 22 insertions, 5 deletions
diff --git a/odb/inline.cxx b/odb/inline.cxx
index 036a728..79398c5 100644
--- a/odb/inline.cxx
+++ b/odb/inline.cxx
@@ -67,16 +67,30 @@ namespace inline_
 
   struct class_: traversal::class_, virtual context
   {
+    class_ ()
+        : typedefs_ (false)
+    {
+      *this >> defines_ >> *this;
+      *this >> typedefs_ >> *this;
+    }
+
     virtual void
     traverse (type& c)
     {
-      if (!options.at_once () && class_file (c) != unit.file ())
+      class_kind_type ck (class_kind (c));
+
+      if (ck == class_other ||
+          (!options.at_once () && class_file (c) != unit.file ()))
         return;
 
-      if (object (c))
-        traverse_object (c);
-      else if (view (c))
-        traverse_view (c);
+      names (c);
+
+      switch (ck)
+      {
+      case class_object: traverse_object (c); break;
+      case class_view: traverse_view (c); break;
+      default: break;
+      }
     }
 
     void
@@ -86,6 +100,9 @@ namespace inline_
     traverse_view (type&);
 
   private:
+    traversal::defines defines_;
+    typedefs typedefs_;
+
     callback_calls callback_calls_;
   };
 }