1 files changed, 18 insertions, 16 deletions
diff --git a/odb/relational/type-processor.cxx b/odb/relational/type-processor.cxx
index 7b5eb13..52bec34 100644
--- a/odb/relational/type-processor.cxx
+++ b/odb/relational/type-processor.cxx
@@ -12,26 +12,28 @@
 
 using namespace std;
 
-// Indirect (dynamic) context values.
-//
-static semantics::type*
-id_tree_type (context& c)
-{
-  semantics::data_member& id (c.id_member (*c.object));
-  return &id.type ();
-}
-
-static string
-id_column_type (context& c)
-{
-  semantics::data_member& id (c.id_member (*c.object));
-  return id.get<string> ("ref-column-type");
-}
-
 namespace relational
 {
   namespace
   {
+    // Indirect (dynamic) context values.
+    //
+    static semantics::type*
+    id_tree_type ()
+    {
+      context& c (context::current ());
+      semantics::data_member& id (context::id_member (*c.object));
+      return &id.type ();
+    }
+
+    static string
+    id_column_type ()
+    {
+      context& c (context::current ());
+      semantics::data_member& id (context::id_member (*c.object));
+      return id.get<string> ("ref-column-type");
+    }
+
     struct data_member: traversal::data_member, context
     {
       data_member ()