summaryrefslogtreecommitdiff
path: root/odb/common.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-03-10 12:41:33 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-03-21 15:40:00 +0200
commit63403a8a095ceba0ad9a17e46013a46918726181 (patch)
tree4ea1b907bf94124cf7b4dc831b631c91a98993be /odb/common.cxx
parentfa1fa57d5fe1cb901520f03e7f802a156aae1034 (diff)
Set context::object in all common traversers
Diffstat (limited to 'odb/common.cxx')
-rw-r--r--odb/common.cxx14
1 files changed, 13 insertions, 1 deletions
diff --git a/odb/common.cxx b/odb/common.cxx
index 342f28b..1115565 100644
--- a/odb/common.cxx
+++ b/odb/common.cxx
@@ -183,13 +183,25 @@ traverse_composite (semantics::data_member& m,
void object_columns_base::
traverse (semantics::class_& c)
{
+ bool obj (c.count ("object"));
+
// Ignore transient bases.
//
- if (!(c.count ("object") || context::comp_value (c)))
+ if (!(obj || context::comp_value (c)))
return;
+ semantics::class_* prev;
+ if (obj)
+ {
+ prev = object;
+ object = &c;
+ }
+
inherits (c);
names (c);
+
+ if (obj)
+ object = prev;
}
void object_columns_base::member::