From 130d691d607f2ff78865cc84b6fe46a7e79daa9a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Aug 2011 14:00:18 +0200
Subject: Cosmetic changes and cleanups

Rename some functions to have consistent names. Add object() predicate.
---
 odb/relational/common.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'odb/relational/common.cxx')

diff --git a/odb/relational/common.cxx b/odb/relational/common.cxx
index 2a4a461..ae2e1f4 100644
--- a/odb/relational/common.cxx
+++ b/odb/relational/common.cxx
@@ -25,7 +25,7 @@ namespace relational
   }
 
   query_columns::
-  query_columns (semantics::class_& c) //@@ context::object
+  query_columns (semantics::class_& c) //@@ context::{cur,top}_object
       : ptr_ (true), decl_ (false)
   {
     scope_ = "access::object_traits< " + c.fq_name () + " >::query_columns";
@@ -33,7 +33,7 @@ namespace relational
   }
 
   void query_columns::
-  object (semantics::class_& c)
+  traverse_object (semantics::class_& c)
   {
     // We only want members for objects unless we are traversing a
     // pointer, in which case we need the whole thing.
@@ -45,13 +45,13 @@ namespace relational
   }
 
   void query_columns::
-  composite (semantics::data_member* m, semantics::class_& c)
+  traverse_composite (semantics::data_member* m, semantics::class_& c)
   {
     // Base type.
     //
     if (m == 0)
     {
-      object_columns_base::composite (m, c);
+      object_columns_base::traverse_composite (m, c);
       return;
     }
 
@@ -64,7 +64,7 @@ namespace relational
          << "struct " << name
          << "{";
 
-      object_columns_base::composite (m, c);
+      object_columns_base::traverse_composite (m, c);
 
       os << "};";
     }
@@ -73,14 +73,14 @@ namespace relational
       string old_scope (scope_);
       scope_ += "::" + name;
 
-      object_columns_base::composite (m, c);
+      object_columns_base::traverse_composite (m, c);
 
       scope_ = old_scope;
     }
   }
 
   bool query_columns::
-  column (semantics::data_member& m, string const& col_name, bool)
+  traverse_column (semantics::data_member& m, string const& col_name, bool)
   {
     string name (public_name (m));
 
-- 
cgit v1.1