From ad82296958864bd7302be345e4b25003e307334f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 16 Jun 2015 14:04:40 +0200 Subject: Use (!) to denote database in modifier expressions --- odb/relational/source.hxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'odb/relational/source.hxx') 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 << "}"; -- cgit v1.1