From 0d59e889e52c9495e42492b74b99076e3b3f3361 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Dec 2011 12:29:53 +0200
Subject: Rename *_chunk to chunk_* enumerators in Oracle for consistency

---
 odb/oracle/oracle-types.hxx |  8 ++++----
 odb/oracle/statement.cxx    | 14 +++++++-------
 odb/oracle/traits.cxx       | 32 ++++++++++++++++----------------
 odb/oracle/traits.txx       |  4 ++--
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/odb/oracle/oracle-types.hxx b/odb/oracle/oracle-types.hxx
index bd62fe1..6e01bf7 100644
--- a/odb/oracle/oracle-types.hxx
+++ b/odb/oracle/oracle-types.hxx
@@ -21,10 +21,10 @@ namespace odb
   {
     enum chunk_position
     {
-      one_chunk,
-      first_chunk,
-      next_chunk,
-      last_chunk
+      chunk_one,
+      chunk_first,
+      chunk_next,
+      chunk_last
     };
 
     // Callback function signature used to specify LOB parameters that are
diff --git a/odb/oracle/statement.cxx b/odb/oracle/statement.cxx
index e62c927..bc31d1c 100644
--- a/odb/oracle/statement.cxx
+++ b/odb/oracle/statement.cxx
@@ -101,22 +101,22 @@ namespace odb
 
         switch (pos)
         {
-        case one_chunk:
+        case chunk_one:
           {
             *piece = OCI_ONE_PIECE;
             break;
           }
-        case first_chunk:
+        case chunk_first:
           {
             *piece = OCI_FIRST_PIECE;
             break;
           }
-        case next_chunk:
+        case chunk_next:
           {
             *piece = OCI_NEXT_PIECE;
             break;
           }
-        case last_chunk:
+        case chunk_last:
           {
             *piece = OCI_LAST_PIECE;
             break;
@@ -1029,11 +1029,11 @@ namespace odb
             chunk_position cp;
 
             if (piece == OCI_FIRST_PIECE)
-              cp = r == OCI_SUCCESS ? one_chunk : first_chunk;
+              cp = r == OCI_SUCCESS ? chunk_one : chunk_first;
             else if (r == OCI_NEED_DATA)
-              cp = next_chunk;
+              cp = chunk_next;
             else
-              cp = last_chunk;
+              cp = chunk_last;
 
             piece = OCI_NEXT_PIECE;
 
diff --git a/odb/oracle/traits.cxx b/odb/oracle/traits.cxx
index 8b1ab34..8c0f236 100644
--- a/odb/oracle/traits.cxx
+++ b/odb/oracle/traits.cxx
@@ -106,15 +106,15 @@ namespace odb
 
       switch (p)
       {
-      case one_chunk:
-      case first_chunk:
+      case chunk_one:
+      case chunk_first:
         {
           v.clear ();
 
           // Falling through.
         }
-      case next_chunk:
-      case last_chunk:
+      case chunk_next:
+      case chunk_last:
         {
           v.append (static_cast<char*> (b), s);
           break;
@@ -135,7 +135,7 @@ namespace odb
     {
       const string& v (*static_cast<const string*> (c));
 
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (v.size ());
       *b = v.c_str ();
 
@@ -157,7 +157,7 @@ namespace odb
     {
       const char* v (static_cast<const char*> (c));
 
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (strlen (v));
       *b = v;
 
@@ -175,15 +175,15 @@ namespace odb
 
       switch (p)
       {
-      case one_chunk:
-      case first_chunk:
+      case chunk_one:
+      case chunk_first:
         {
           v.clear ();
 
           // Falling through.
         }
-      case next_chunk:
-      case last_chunk:
+      case chunk_next:
+      case chunk_last:
         {
           char* cb (static_cast<char*> (b));
           v.insert (v.end (), cb, cb + s);
@@ -206,7 +206,7 @@ namespace odb
     {
       const value_type& v (*static_cast<const value_type*> (c));
 
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (v.size ());
       *b = &v.front ();
 
@@ -224,15 +224,15 @@ namespace odb
 
       switch (p)
       {
-      case one_chunk:
-      case first_chunk:
+      case chunk_one:
+      case chunk_first:
         {
           v.clear ();
 
           // Falling through.
         }
-      case next_chunk:
-      case last_chunk:
+      case chunk_next:
+      case chunk_last:
         {
           unsigned char* cb (static_cast<unsigned char*> (b));
           v.insert (v.end (), cb, cb + s);
@@ -255,7 +255,7 @@ namespace odb
     {
       const value_type& v (*static_cast<const value_type*> (c));
 
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (v.size ());
       *b = &v.front ();
 
diff --git a/odb/oracle/traits.txx b/odb/oracle/traits.txx
index 86eab47..6ead173 100644
--- a/odb/oracle/traits.txx
+++ b/odb/oracle/traits.txx
@@ -31,7 +31,7 @@ namespace odb
                     void*,
                     ub4)
     {
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (N);
       *b = c;
       return true;
@@ -61,7 +61,7 @@ namespace odb
                     void*,
                     ub4)
     {
-      *p = one_chunk;
+      *p = chunk_one;
       *s = static_cast<ub4> (N);
       *b = c;
       return true;
-- 
cgit v1.1