aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-11-16 11:45:22 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-11-16 12:48:18 +0200
commitce623b4595beef09f51fdef7c6f28cc4c0efca45 (patch)
treebeb503962c5511164b46623d8ea26a54f7978108
parent65b89ab22d0d2fe3cff2f3c071b3628b786afeb5 (diff)
Allocate position context in lob struct instead of in LOB image
-rw-r--r--odb/oracle/oracle-types.cxx4
-rw-r--r--odb/oracle/oracle-types.hxx4
-rw-r--r--odb/oracle/statement.cxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/odb/oracle/oracle-types.cxx b/odb/oracle/oracle-types.cxx
index 9f2ca3e..7036c9a 100644
--- a/odb/oracle/oracle-types.cxx
+++ b/odb/oracle/oracle-types.cxx
@@ -29,7 +29,7 @@ namespace odb
lob (lob& x)
: locator (x.locator),
buffer (x.buffer),
- position_context (x.position_context)
+ position (x.position)
{
x.locator = 0;
}
@@ -44,7 +44,7 @@ namespace odb
locator = x.locator;
buffer = x.buffer;
- position_context = x.position_context;
+ position = x.position;
x.locator = 0;
}
diff --git a/odb/oracle/oracle-types.hxx b/odb/oracle/oracle-types.hxx
index 01e5956..ec31280 100644
--- a/odb/oracle/oracle-types.hxx
+++ b/odb/oracle/oracle-types.hxx
@@ -139,7 +139,7 @@ namespace odb
//
struct LIBODB_ORACLE_EXPORT lob
{
- lob (): locator (0), buffer (0), position_context (0) {}
+ lob (): locator (0), buffer (0), position (0) {}
lob (lob&);
lob& operator= (lob&);
@@ -149,7 +149,7 @@ namespace odb
public:
OCILobLocator* locator;
details::buffer* buffer;
- ub4* position_context;
+ ub4 position;
};
//
diff --git a/odb/oracle/statement.cxx b/odb/oracle/statement.cxx
index 33af160..ce3949f 100644
--- a/odb/oracle/statement.cxx
+++ b/odb/oracle/statement.cxx
@@ -88,7 +88,7 @@ namespace odb
{
chunk_position pos;
if (!(*b.callback->param) (b.context->param,
- l->position_context,
+ &l->position,
const_cast<const void**> (buffer),
size,
&pos,