summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-10-14 15:26:58 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-10-21 11:47:14 +0200
commit1911d85d772ea259c75e6dcb6577d671b5364a99 (patch)
tree92ae234653a57e58a2e38193eb70d0fdd88a3f1d
parente316e483104637ac23d842fe8ca583aa372d3dc1 (diff)
Aesthetic changes and syntax corrections
-rw-r--r--odb/option-types.hxx4
-rw-r--r--odb/relational/oracle/header.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/odb/option-types.hxx b/odb/option-types.hxx
index 42737f3..683095d 100644
--- a/odb/option-types.hxx
+++ b/odb/option-types.hxx
@@ -69,9 +69,7 @@ operator<< (std::ostream&, schema_format);
//
struct oracle_version
{
- oracle_version (): major_ (0), minor_ (0)
- {
- }
+ oracle_version (): major_ (0), minor_ (0) {}
oracle_version (unsigned short major, unsigned short minor)
: major_ (major), minor_ (minor)
diff --git a/odb/relational/oracle/header.cxx b/odb/relational/oracle/header.cxx
index b6a25b7..5bfb8d0 100644
--- a/odb/relational/oracle/header.cxx
+++ b/odb/relational/oracle/header.cxx
@@ -170,7 +170,8 @@ namespace relational
!mi.st->byte_semantics)
n *= 4;
- if (t == sql_type::CHAR || t == sql_type::NCHAR ||
+ if (t == sql_type::CHAR ||
+ t == sql_type::NCHAR ||
t == sql_type::RAW)
n = n > 2000 ? 2000 : n;
else if (t == sql_type::VARCHAR2 || t == sql_type::NVARCHAR2)
@@ -187,7 +188,8 @@ namespace relational
{
os << image_type << " " << mi.var << "callback;"
<< "sb2 " << mi.var << "indicator;"
- << "auto_descriptor<OCILobLocator> " << mi.var << "lob;"
+ << "oracle::auto_descriptor<OCILobLocator> " << mi.var <<
+ "lob;"
<< "void* " << mi.var << "context;"
<< "ub4 " << mi.var << "position_context;"
<< "char " << mi.var << "buffer[4096];"