diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-16 14:04:40 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-16 14:04:40 +0200 |
commit | ad82296958864bd7302be345e4b25003e307334f (patch) | |
tree | 657f969effbdb3b8e85aeb488cc983196ab0621d /odb/relational | |
parent | e4b1b83a5a0fd902824071d5db04d7cda17e2f88 (diff) |
Use (!) to denote database in modifier expressions
Diffstat (limited to 'odb/relational')
-rw-r--r-- | odb/relational/source.cxx | 8 | ||||
-rw-r--r-- | odb/relational/source.hxx | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx index c2144b4..4bb8e9d 100644 --- a/odb/relational/source.cxx +++ b/odb/relational/source.cxx @@ -1289,7 +1289,9 @@ traverse_object (type& c) os << "// From " << location_string (ma.loc, true) << endl; if (ma.placeholder ()) - os << ma.translate ("obj", "id (sts.id_image ())") << ";" + os << ma.translate ( + "obj", "id (sts.id_image ())", + "static_cast<" + db.string () + "::database&> (db)") << ";" << endl; else { @@ -1546,7 +1548,9 @@ traverse_object (type& c) os << "// From " << location_string (ma.loc, true) << endl; if (ma.placeholder ()) - os << ma.translate ("obj", "id (sts.id_image (i))") << ";" + os << ma.translate ( + "obj", "id (sts.id_image (i))", + "static_cast<" + db.string () + "::database&> (db)") << ";" << endl; else { diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 7774739..5880a2b 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -2753,7 +2753,9 @@ namespace relational if (!ma.synthesized) os << "// From " << location_string (ma.loc, true) << endl; - os << ma.translate ("o", "v") << ";"; + os << ma.translate ( + "o", "v", "*static_cast<" + db.string () + "::database*> (db)") + << ";"; } } @@ -3234,7 +3236,9 @@ namespace relational os << "// From " << location_string (ma.loc, true) << endl; if (ma.placeholder ()) - os << ma.translate ("o", r) << ";"; + os << ma.translate ( + "o", r, "*static_cast<" + db.string () + "::database*> (db)") + << ";"; else os << ma.translate ("o") << " = " << r << ";"; } @@ -3248,7 +3252,9 @@ namespace relational os << "// From " << location_string (ma.loc, true) << endl; if (ma.placeholder ()) - os << ma.translate ("o", o) << ";"; + os << ma.translate ( + "o", o, "*static_cast<" + db.string () + "::database*> (db)") + << ";"; else os << ma.translate ("o") << " = " << o << ";"; } @@ -5320,7 +5326,9 @@ namespace relational if (!ma.synthesized) os << "// From " << location_string (ma.loc, true) << endl; - os << ma.translate (obj_prefix_, "v") << ";"; + os << ma.translate ( + obj_prefix_, "v", "static_cast<" + db.string () + + "::database&> (db)") << ";"; } os << "}"; |