aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-09-08 08:49:02 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-09-08 08:49:02 +0200
commit35e4e0a52af198db73965a4e316d716d69c7eb81 (patch)
treec94635fc577198e6f70623f335adae5a9c600bee
parenta3eb3fedc5478b28a813b689daca88fc2ac6e50a (diff)
Rename insert_statement::id_bind_type union members
-rw-r--r--odb/oracle/statement.cxx12
-rw-r--r--odb/oracle/statement.hxx4
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<bind*> (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<void*> (&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;