diff options
Diffstat (limited to 'odb/relational/mysql')
| -rw-r--r-- | odb/relational/mysql/common.cxx | 2 | ||||
| -rw-r--r-- | odb/relational/mysql/context.cxx | 2 | ||||
| -rw-r--r-- | odb/relational/mysql/source.cxx | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/odb/relational/mysql/common.cxx b/odb/relational/mysql/common.cxx index cc657d1..c2e6fa3 100644 --- a/odb/relational/mysql/common.cxx +++ b/odb/relational/mysql/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/mysql/context.cxx b/odb/relational/mysql/context.cxx index 8843fe0..ccd1861 100644 --- a/odb/relational/mysql/context.cxx +++ b/odb/relational/mysql/context.cxx @@ -124,7 +124,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 ("mysql-grow")) diff --git a/odb/relational/mysql/source.cxx b/odb/relational/mysql/source.cxx index 190ca93..02bc74b 100644 --- a/odb/relational/mysql/source.cxx +++ b/odb/relational/mysql/source.cxx @@ -185,7 +185,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++;"; @@ -357,7 +357,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_++; @@ -510,7 +510,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. // @@ -518,7 +518,7 @@ namespace relational "get_ref (" + member + ")"; } - if (comp_value (mi.t)) + if (composite (mi.t)) traits = "composite_value_traits< " + mi.fq_type () + " >"; else { @@ -591,7 +591,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. @@ -779,7 +779,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. // @@ -787,7 +787,7 @@ namespace relational "set_ref (" + member + ")"; } - if (comp_value (mi.t)) + if (composite (mi.t)) traits = "composite_value_traits< " + mi.fq_type () + " >"; else { @@ -839,7 +839,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 |