From 2cf8874cc29fa5b9869c6048987971beb8911114 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Wed, 16 Nov 2011 11:46:26 +0200 Subject: Allocate position context in oracle::lob struct instead of in Oracle LOB image --- odb/relational/oracle/header.cxx | 1 - odb/relational/oracle/source.cxx | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'odb') diff --git a/odb/relational/oracle/header.cxx b/odb/relational/oracle/header.cxx index 17c1103..25efea3 100644 --- a/odb/relational/oracle/header.cxx +++ b/odb/relational/oracle/header.cxx @@ -216,7 +216,6 @@ namespace relational << "sb2 " << mi.var << "indicator;" << "oracle::lob " << mi.var << "lob;" << "mutable oracle::lob_context " << mi.var << "context;" - << "ub4 " << mi.var << "position_context;" << endl; } diff --git a/odb/relational/oracle/source.cxx b/odb/relational/oracle/source.cxx index 5c66154..1ca35fd 100644 --- a/odb/relational/oracle/source.cxx +++ b/odb/relational/oracle/source.cxx @@ -301,12 +301,9 @@ namespace relational { os << b << ".type = " << lob_buffer_types[mi.st->type - sql_type::BLOB] << ";" - << arg << "." << mi.var << "lob.position_context = &" << arg << - "." << mi.var << "position_context;" << b << ".buffer = &" << arg << "." << mi.var << "lob;" << b << ".indicator = &" << arg << "." << mi.var << "indicator;" - << b << ".callback = &" << arg << "." << mi.var << - "callback;" + << b << ".callback = &" << arg << "." << mi.var << "callback;" << b << ".context = &" << arg << "." << mi.var << "context;" << endl; } @@ -587,7 +584,7 @@ namespace relational virtual void traverse_lob (member_info& mi) { - os << "i." << mi.var << "position_context = 0;" + os << "i." << mi.var << "lob.position = 0;" << traits << "::set_image (" << endl << "i." << mi.var << "callback.param," << endl << "i." << mi.var << "context.param," << endl -- cgit v1.1