summaryrefslogtreecommitdiff
path: root/odb/relational/sqlite
diff options
context:
space:
mode:
Diffstat (limited to 'odb/relational/sqlite')
-rw-r--r--odb/relational/sqlite/common.cxx2
-rw-r--r--odb/relational/sqlite/context.cxx2
-rw-r--r--odb/relational/sqlite/source.cxx16
3 files changed, 10 insertions, 10 deletions
diff --git a/odb/relational/sqlite/common.cxx b/odb/relational/sqlite/common.cxx
index 1578561..3429d9f 100644
--- a/odb/relational/sqlite/common.cxx
+++ b/odb/relational/sqlite/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/sqlite/context.cxx b/odb/relational/sqlite/context.cxx
index 149cf0a..f10e904 100644
--- a/odb/relational/sqlite/context.cxx
+++ b/odb/relational/sqlite/context.cxx
@@ -111,7 +111,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 ("sqlite-grow"))
diff --git a/odb/relational/sqlite/source.cxx b/odb/relational/sqlite/source.cxx
index a482184..4a2b0ab 100644
--- a/odb/relational/sqlite/source.cxx
+++ b/odb/relational/sqlite/source.cxx
@@ -61,7 +61,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++;";
@@ -157,7 +157,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_++;
@@ -243,7 +243,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.
//
@@ -251,7 +251,7 @@ namespace relational
"get_ref (" + member + ")";
}
- if (comp_value (mi.t))
+ if (composite (mi.t))
traits = "composite_value_traits< " + mi.fq_type () + " >";
else
{
@@ -324,7 +324,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.
@@ -430,7 +430,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.
//
@@ -438,7 +438,7 @@ namespace relational
"set_ref (" + member + ")";
}
- if (comp_value (mi.t))
+ if (composite (mi.t))
traits = "composite_value_traits< " + mi.fq_type () + " >";
else
{
@@ -490,7 +490,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