diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-11-30 08:57:37 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-11-30 08:57:37 +0200 |
| commit | eb2ec682e3f79b20dbda5f3e8b0e4c0b567dfc66 (patch) | |
| tree | 34338e91d9bf6da14ca20b471cf0c47e5d12a769 /odb | |
| parent | 57312e9fcaa3d9df5e75445ba811e3eee8e55df9 (diff) | |
Merge LOB callback function and context into struct
This allows us to have one less member in the bind struct.
Diffstat (limited to 'odb')
| -rw-r--r-- | odb/relational/oracle/header.cxx | 1 | ||||
| -rw-r--r-- | odb/relational/oracle/source.cxx | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/odb/relational/oracle/header.cxx b/odb/relational/oracle/header.cxx index 167d0a4..f99b5e3 100644 --- a/odb/relational/oracle/header.cxx +++ b/odb/relational/oracle/header.cxx @@ -213,7 +213,6 @@ namespace relational traverse_lob (member_info& mi) { os << "mutable " << image_type << " " << mi.var << "callback;" - << "mutable oracle::lob_context " << mi.var << "context;" << "sb2 " << mi.var << "indicator;" << "oracle::lob " << mi.var << "lob;" << endl; diff --git a/odb/relational/oracle/source.cxx b/odb/relational/oracle/source.cxx index 6b65f6f..066947e 100644 --- a/odb/relational/oracle/source.cxx +++ b/odb/relational/oracle/source.cxx @@ -304,7 +304,6 @@ namespace relational << b << ".buffer = &" << arg << "." << mi.var << "lob;" << b << ".indicator = &" << arg << "." << mi.var << "indicator;" << b << ".callback = &" << arg << "." << mi.var << "callback;" - << b << ".context = &" << arg << "." << mi.var << "context;" << endl; } @@ -586,8 +585,8 @@ namespace relational { os << "i." << mi.var << "lob.position = 0;" << traits << "::set_image (" << endl - << "i." << mi.var << "callback.param," << endl - << "i." << mi.var << "context.param," << endl + << "i." << mi.var << "callback.callback.param," << endl + << "i." << mi.var << "callback.context.param," << endl << "is_null," << endl << member << ");"; } @@ -867,8 +866,8 @@ namespace relational { os << traits << "::set_value (" << endl << member << "," << endl - << "i." << mi.var << "callback.result," << endl - << "i." << mi.var << "context.result," << endl + << "i." << mi.var << "callback.callback.result," << endl + << "i." << mi.var << "callback.context.result," << endl << "i." << mi.var << "indicator == -1);" << endl; } |