diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-31 14:19:56 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-31 14:19:56 +0200 |
commit | a7ec19749a76cc262240124f5c71c1ee4051cba7 (patch) | |
tree | b88fcfe27f1128d439e1e7c1ef470130737cacd4 /odb/relational/pgsql | |
parent | 47d57dc9af5db83e5b508282b844064caf9b7968 (diff) |
Rename comp_value() predicate to composite()
Diffstat (limited to 'odb/relational/pgsql')
-rw-r--r-- | odb/relational/pgsql/common.cxx | 2 | ||||
-rw-r--r-- | odb/relational/pgsql/context.cxx | 2 | ||||
-rw-r--r-- | odb/relational/pgsql/schema.cxx | 2 | ||||
-rw-r--r-- | odb/relational/pgsql/source.cxx | 20 |
4 files changed, 13 insertions, 13 deletions
diff --git a/odb/relational/pgsql/common.cxx b/odb/relational/pgsql/common.cxx index a753d86..facdb0f 100644 --- a/odb/relational/pgsql/common.cxx +++ b/odb/relational/pgsql/common.cxx @@ -35,7 +35,7 @@ namespace relational semantics::type& t (type_override_ != 0 ? *type_override_ : m.type ()); - if (semantics::class_* c = comp_value_wrapper (t)) + if (semantics::class_* c = composite_wrapper (t)) { // If t is a wrapper, pass the wrapped type. Also pass the // original, wrapper type. diff --git a/odb/relational/pgsql/context.cxx b/odb/relational/pgsql/context.cxx index 20dc460..68739df 100644 --- a/odb/relational/pgsql/context.cxx +++ b/odb/relational/pgsql/context.cxx @@ -113,7 +113,7 @@ namespace relational { // Ignore transient bases. // - if (!(context::object (c) || context::comp_value (c))) + if (!(context::object (c) || context::composite (c))) return; if (c.count ("pgsql-grow")) diff --git a/odb/relational/pgsql/schema.cxx b/odb/relational/pgsql/schema.cxx index 761206e..a1ef29d 100644 --- a/odb/relational/pgsql/schema.cxx +++ b/odb/relational/pgsql/schema.cxx @@ -213,7 +213,7 @@ namespace relational // value // - if (semantics::class_* cvt = comp_value_wrapper (vt)) + if (semantics::class_* cvt = composite_wrapper (vt)) { object_columns_references ocr (e_, os_, name); ocr.traverse (m, *cvt, "value", "value"); diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx index 5050315..b869520 100644 --- a/odb/relational/pgsql/source.cxx +++ b/odb/relational/pgsql/source.cxx @@ -161,7 +161,7 @@ namespace relational { if (var_override_.empty ()) { - if (semantics::class_* c = comp_value (mi.t)) + if (semantics::class_* c = composite (mi.t)) os << "n += " << in_column_count (*c) << "UL;"; else os << "n++;"; @@ -299,7 +299,7 @@ namespace relational virtual void post (member_info& mi) { - if (semantics::class_* c = comp_value (mi.t)) + if (semantics::class_* c = composite (mi.t)) index_ += in_column_count (*c); else index_++; @@ -426,7 +426,7 @@ namespace relational // "unwrap" it. For simple values this is taken care of // by the value_traits specializations. // - if (mi.wrapper != 0 && comp_value (mi.t)) + if (mi.wrapper != 0 && composite (mi.t)) { // Here we need the wrapper type, not the wrapped type. // @@ -434,7 +434,7 @@ namespace relational "get_ref (" + member + ")"; } - if (comp_value (mi.t)) + if (composite (mi.t)) traits = "composite_value_traits< " + mi.fq_type () + " >"; else { @@ -507,7 +507,7 @@ namespace relational virtual void post (member_info& mi) { - if (!comp_value (mi.t)) + if (!composite (mi.t)) { // When handling a pointer, mi.t is the id type of the referenced // object. @@ -669,7 +669,7 @@ namespace relational // "unwrap" it. For simple values this is taken care of // by the value_traits specializations. // - if (mi.wrapper != 0 && comp_value (mi.t)) + if (mi.wrapper != 0 && composite (mi.t)) { // Here we need the wrapper type, not the wrapped type. // @@ -677,7 +677,7 @@ namespace relational "set_ref (" + member + ")"; } - if (comp_value (mi.t)) + if (composite (mi.t)) traits = "composite_value_traits< " + mi.fq_type () + " >"; else { @@ -729,7 +729,7 @@ namespace relational virtual void post (member_info& mi) { - if (comp_value (mi.t)) + if (composite (mi.t)) return; // When handling a pointer, mi.t is the id type of the referenced @@ -1094,7 +1094,7 @@ namespace relational case ck_multimap: { if (semantics::class_* ktc = - comp_value_wrapper (container_kt (t))) + composite_wrapper (container_kt (t))) { instance<statement_oids> st; st->traverse (m, *ktc, "key", "key"); @@ -1112,7 +1112,7 @@ namespace relational } } - if (semantics::class_* vtc = comp_value_wrapper (vt)) + if (semantics::class_* vtc = composite_wrapper (vt)) { instance <statement_oids> st; st->traverse (m, *vtc, "value", "value"); |