From a7ec19749a76cc262240124f5c71c1ee4051cba7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 31 Aug 2011 14:19:56 +0200
Subject: Rename comp_value() predicate to composite()

---
 odb/relational/source.hxx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'odb/relational/source.hxx')

diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
index a81ac3a..d9cf66f 100644
--- a/odb/relational/source.hxx
+++ b/odb/relational/source.hxx
@@ -406,7 +406,7 @@ namespace relational
 
         // Ignore transient bases.
         //
-        if (!(obj || comp_value (c)))
+        if (!(obj || composite (c)))
           return;
 
         os << "// " << c.name () << " base" << endl
@@ -463,7 +463,7 @@ namespace relational
 
         // Ignore transient bases.
         //
-        if (!(obj || comp_value (c)))
+        if (!(obj || composite (c)))
           return;
 
         os << "// " << c.name () << " base" << endl
@@ -521,7 +521,7 @@ namespace relational
 
         // Ignore transient bases.
         //
-        if (!(obj || comp_value (c)))
+        if (!(obj || composite (c)))
           return;
 
         os << "// " << c.name () << " base" << endl
@@ -572,7 +572,7 @@ namespace relational
 
         // Ignore transient bases.
         //
-        if (!(obj || comp_value (c)))
+        if (!(obj || composite (c)))
           return;
 
         os << "// " << c.name () << " base" << endl
@@ -777,7 +777,7 @@ namespace relational
               {
                 instance<object_columns> t (table, false, false);
 
-                if (semantics::class_* ckt = comp_value_wrapper (*kt))
+                if (semantics::class_* ckt = composite_wrapper (*kt))
                   t->traverse (m, *ckt, "key", "key");
                 else
                 {
@@ -796,7 +796,7 @@ namespace relational
 
             instance<object_columns> t (table, false);
 
-            if (semantics::class_* cvt = comp_value_wrapper (vt))
+            if (semantics::class_* cvt = composite_wrapper (vt))
               t->traverse (m, *cvt, "value", "value");
             else
             {
@@ -853,7 +853,7 @@ namespace relational
               {
                 instance<object_columns> t (false, false);
 
-                if (semantics::class_* ckt = comp_value_wrapper (*kt))
+                if (semantics::class_* ckt = composite_wrapper (*kt))
                   t->traverse (m, *ckt, "key", "key");
                 else
                 {
@@ -871,7 +871,7 @@ namespace relational
 
             instance<object_columns> t (false);
 
-            if (semantics::class_* cvt = comp_value_wrapper (vt))
+            if (semantics::class_* cvt = composite_wrapper (vt))
               t->traverse (m, *cvt, "value", "value");
             else
             {
@@ -1029,7 +1029,7 @@ namespace relational
               instance<bind_member> bm ("key_", "d", *kt, "key_type", "key");
               bm->traverse (m);
 
-              if (semantics::class_* c = comp_value_wrapper (*kt))
+              if (semantics::class_* c = composite_wrapper (*kt))
                 os << "n += " << in_column_count (*c) << "UL;"
                    << endl;
               else
@@ -1902,7 +1902,7 @@ namespace relational
 
         if (object (c))
           traverse_object (c);
-        else if (comp_value (c))
+        else if (composite (c))
           traverse_composite (c);
       }
 
-- 
cgit v1.1