diff options
Diffstat (limited to 'odb/relational')
| -rw-r--r-- | odb/relational/common.txx | 2 | ||||
| -rw-r--r-- | odb/relational/source.cxx | 12 | ||||
| -rw-r--r-- | odb/relational/source.hxx | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/odb/relational/common.txx b/odb/relational/common.txx index d428068..7a3adad 100644 --- a/odb/relational/common.txx +++ b/odb/relational/common.txx @@ -25,7 +25,7 @@ namespace relational var = name + (name[name.size () - 1] == '_' ? "" : "_"); } - bool cq (type_override_ != 0 ? false : const_type (m.type ())); + bool cq (type_override_ != 0 ? false : const_member (m)); semantics::type& t (type_override_ != 0 ? *type_override_ : utype (m)); semantics::type* cont; diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx index 4bb8e9d..97e7ea0 100644 --- a/odb/relational/source.cxx +++ b/odb/relational/source.cxx @@ -1299,7 +1299,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (ma.direct () && const_type (id->type ())); + bool cast (ma.direct () && const_member (*id)); if (cast) os << "const_cast< id_type& > (" << endl; @@ -1334,7 +1334,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (opt_ma_set->direct () && const_type (opt->type ())); + bool cast (opt_ma_set->direct () && const_member (*opt)); if (cast) os << "const_cast< version_type& > (" << endl; @@ -1558,7 +1558,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (ma.direct () && const_type (id->type ())); + bool cast (ma.direct () && const_member (*id)); if (cast) os << "const_cast< id_type& > (" << endl; @@ -1593,7 +1593,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (opt_ma_set->direct () && const_type (opt->type ())); + bool cast (opt_ma_set->direct () && const_member (*opt)); if (cast) os << "const_cast< version_type& > (" << endl; @@ -2140,7 +2140,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (opt_ma_set->direct () && const_type (opt->type ())); + bool cast (opt_ma_set->direct () && const_member (*opt)); if (cast) os << "const_cast< version_type& > (" << endl; @@ -2459,7 +2459,7 @@ traverse_object (type& c) // then cast away constness. Otherwise, we assume that the user- // provided expression handles this. // - bool cast (opt_ma_set->direct () && const_type (opt->type ())); + bool cast (opt_ma_set->direct () && const_member (*opt)); if (cast) os << "const_cast< version_type& > (" << endl; diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 53034ac..56949d6 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -5066,7 +5066,7 @@ namespace relational // that the user-provided expression handles this. // bool cast ( - call_ == load_call && ma.direct () && const_type (m->type ())); + call_ == load_call && ma.direct () && const_member (*m)); if (cast) obj_prefix_ = "const_cast< " + member_ref_type (*m, false) + " > (\n"; @@ -5090,7 +5090,7 @@ namespace relational semantics::names* hint; semantics::type& t (utype (*m, hint)); - // Because we cannot have nested containers, m.type () should + // Because we cannot have nested containers, member type should // be the same as w. // assert (&t == w); @@ -5211,7 +5211,7 @@ namespace relational // that the user-provided expression handles this. // bool cast ( - call_ == load_call && ma.direct () && const_type (m.type ())); + call_ == load_call && ma.direct () && const_member (m)); if (cast) os << "const_cast< " << member_ref_type (m, false) << " > (" << endl; @@ -6353,7 +6353,7 @@ namespace relational // access, then cast away constness. Otherwise, we assume // that the user-provided expression handles this. // - bool cast (ma_set.direct () && const_type (opt->type ())); + bool cast (ma_set.direct () && const_member (*opt)); if (cast) os << "const_cast< version_type& > (" << endl; |