From 35e4e0a52af198db73965a4e316d716d69c7eb81 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Thu, 8 Sep 2011 08:49:02 +0200 Subject: Rename insert_statement::id_bind_type union members --- odb/oracle/statement.cxx | 12 ++++++------ odb/oracle/statement.hxx | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/odb/oracle/statement.cxx b/odb/oracle/statement.cxx index ebdbced..d69a409 100644 --- a/odb/oracle/statement.cxx +++ b/odb/oracle/statement.cxx @@ -238,11 +238,11 @@ namespace odb bind& b (*reinterpret_cast (context)); #ifdef ODB_ORACLE_USE_64_BIT_ID - *buffer = &b.id.long_long_; - **len = sizeof (b.id.long_long_); + *buffer = &b.id.value_64; + **len = sizeof (unsigned long long); #else - *buffer = &b.id.int_; - **len = sizeof (b.id.int_); + *buffer = &b.id.value_32; + **len = sizeof (unsigned int); #endif *ind = reinterpret_cast (&b.ind); @@ -335,9 +335,9 @@ namespace odb id () { #ifdef ODB_ORACLE_USE_64_BIT_ID - return id_bind_.id.long_long_; + return id_bind_.id.value_64; #else - return id_bind_.id.int_; + return id_bind_.id.value_32; #endif } diff --git a/odb/oracle/statement.hxx b/odb/oracle/statement.hxx index cbdb2ce..4dcd804 100644 --- a/odb/oracle/statement.hxx +++ b/odb/oracle/statement.hxx @@ -126,8 +126,8 @@ namespace odb { union { - unsigned int int_; - unsigned long long long_long_; + unsigned int value_32; + unsigned long long value_64; } id; sb2 ind; -- cgit v1.1