From 3e25ac406d1984b1a3efd2d4da8033dc908c3fa0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Sep 2010 19:37:48 +0200
Subject: Get rid of compiler warnings

---
 odb/mysql/common.cxx  | 23 ++++++++++++++---------
 odb/mysql/common.hxx  |  6 +++---
 odb/mysql/context.cxx |  5 +++++
 odb/mysql/header.cxx  | 12 ++++++------
 odb/mysql/source.cxx  | 36 ++++++++++++++++++------------------
 5 files changed, 46 insertions(+), 36 deletions(-)

(limited to 'odb/mysql')

diff --git a/odb/mysql/common.cxx b/odb/mysql/common.cxx
index 5253ed2..284a80e 100644
--- a/odb/mysql/common.cxx
+++ b/odb/mysql/common.cxx
@@ -12,7 +12,7 @@ namespace mysql
   void member_base::
   traverse (type& m)
   {
-    if (m.count ("transient") || id_ && !m.count ("id"))
+    if (m.count ("transient") || (id_ && !m.count ("id")))
       return;
 
     if (id_)
@@ -124,6 +124,11 @@ namespace mysql
         traverse_set (m, t);
         break;
       }
+    case sql_type::invalid:
+      {
+        assert (false);
+        break;
+      }
     }
 
     post (m);
@@ -292,50 +297,50 @@ namespace mysql
   }
 
   void member_database_type::
-  traverse_integer (type& m, sql_type const& t)
+  traverse_integer (type&, sql_type const& t)
   {
     size_t i ((t.type - sql_type::TINYINT) * 2 + (t.unsign ? 1 : 0));
     type_ = string ("mysql::") + integer_database_id[i];
   }
 
   void member_database_type::
-  traverse_float (type& m, sql_type const& t)
+  traverse_float (type&, sql_type const& t)
   {
     type_ = string ("mysql::") + float_database_id[t.type - sql_type::FLOAT];
   }
 
   void member_database_type::
-  traverse_decimal (type& m, sql_type const& t)
+  traverse_decimal (type&, sql_type const&)
   {
     type_ = "mysql::id_decimal";
   }
 
   void member_database_type::
-  traverse_date_time (type& m, sql_type const& t)
+  traverse_date_time (type&, sql_type const& t)
   {
     type_ = string ("mysql::") + date_time_database_id[t.type - sql_type::DATE];
   }
 
   void member_database_type::
-  traverse_string (type& m, sql_type const& t)
+  traverse_string (type&, sql_type const& t)
   {
     type_ = string ("mysql::") + char_bin_database_id[t.type - sql_type::CHAR];
   }
 
   void member_database_type::
-  traverse_bit (type& m, sql_type const& t)
+  traverse_bit (type&, sql_type const&)
   {
     type_ = "mysql::id_bit";
   }
 
   void member_database_type::
-  traverse_enum (type& m, sql_type const&)
+  traverse_enum (type&, sql_type const&)
   {
     type_ = "mysql::id_enum";
   }
 
   void member_database_type::
-  traverse_set (type& m, sql_type const&)
+  traverse_set (type&, sql_type const&)
   {
     type_ = "mysql::id_set";
   }
diff --git a/odb/mysql/common.hxx b/odb/mysql/common.hxx
index 5016843..c689bb6 100644
--- a/odb/mysql/common.hxx
+++ b/odb/mysql/common.hxx
@@ -172,19 +172,19 @@ namespace mysql
     }
 
     virtual void
-    traverse_decimal (type&, sql_type const& t)
+    traverse_decimal (type&, sql_type const&)
     {
       r_ = true;
     }
 
     virtual void
-    traverse_long_string (type&, sql_type const& t)
+    traverse_long_string (type&, sql_type const&)
     {
       r_ = true;
     }
 
     virtual void
-    traverse_short_string (type&, sql_type const& t)
+    traverse_short_string (type&, sql_type const&)
     {
       r_ = true; // @@ Short string optimization disabled.
     }
diff --git a/odb/mysql/context.cxx b/odb/mysql/context.cxx
index 7f69bb2..7665ed6 100644
--- a/odb/mysql/context.cxx
+++ b/odb/mysql/context.cxx
@@ -438,6 +438,11 @@ namespace mysql
             s = parse_done;
             break;
           }
+        case parse_done:
+          {
+            assert (false);
+            break;
+          }
         }
       }
 
diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index 97df10c..b22efbb 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -28,7 +28,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_integer (type&, sql_type const& t)
+      traverse_integer (type&, sql_type const&)
       {
         os << image_type << " " << var << "value;"
            << "my_bool " << var << "null;"
@@ -36,7 +36,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_float (type&, sql_type const& t)
+      traverse_float (type&, sql_type const&)
       {
         os << image_type << " " << var << "value;"
            << "my_bool " << var << "null;"
@@ -44,7 +44,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_decimal (type&, sql_type const& t)
+      traverse_decimal (type&, sql_type const&)
       {
         // Exchanged as strings. Can have up to 65 digits not counting
         // '-' and '.'. If range is not specified, the default is 10.
@@ -63,7 +63,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_date_time (type&, sql_type const& t)
+      traverse_date_time (type&, sql_type const&)
       {
         os << image_type << " " << var << "value;"
            << "my_bool " << var << "null;"
@@ -72,7 +72,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_short_string (type&, sql_type const& t)
+      traverse_short_string (type&, sql_type const&)
       {
         // If range is not specified, the default buffer size is 255.
         //
@@ -89,7 +89,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_long_string (type&, sql_type const& t)
+      traverse_long_string (type&, sql_type const&)
       {
         os << image_type << " " << var << "value;"
            << "unsigned long " << var << "size;"
diff --git a/odb/mysql/source.cxx b/odb/mysql/source.cxx
index 92933e3..e2cf0e8 100644
--- a/odb/mysql/source.cxx
+++ b/odb/mysql/source.cxx
@@ -133,7 +133,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_decimal (type&, sql_type const& t)
+      traverse_decimal (type&, sql_type const&)
       {
         os << b << ".buffer_type = MYSQL_TYPE_NEWDECIMAL;"
            << b << ".buffer = i." << var << "value.data ();"
@@ -190,7 +190,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_bit (type&, sql_type const& t)
+      traverse_bit (type&, sql_type const&)
       {
         // Treated as a BLOB.
         //
@@ -261,21 +261,21 @@ namespace mysql
       }
 
       virtual void
-      traverse_integer (type&, sql_type const& t)
+      traverse_integer (type&, sql_type const&)
       {
         os << e << " = 0;"
            << endl;
       }
 
       virtual void
-      traverse_float (type&, sql_type const& t)
+      traverse_float (type&, sql_type const&)
       {
         os << e << " = 0;"
            << endl;
       }
 
       virtual void
-      traverse_decimal (type&, sql_type const& t)
+      traverse_decimal (type&, sql_type const&)
       {
         // @@ Optimization disabled.
         //
@@ -287,14 +287,14 @@ namespace mysql
       }
 
       virtual void
-      traverse_date_time (type&, sql_type const& t)
+      traverse_date_time (type&, sql_type const&)
       {
         os << e << " = 0;"
            << endl;
       }
 
       virtual void
-      traverse_short_string (type&, sql_type const& t)
+      traverse_short_string (type&, sql_type const&)
       {
         // @@ Optimization disabled.
         //
@@ -306,7 +306,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_long_string (type&, sql_type const& t)
+      traverse_long_string (type&, sql_type const&)
       {
         os << "if (" << e << ")" << endl
            << "{"
@@ -316,7 +316,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_bit (type&, sql_type const& t)
+      traverse_bit (type&, sql_type const&)
       {
         os << e << " = 0;"
            << endl;
@@ -387,7 +387,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_integer (type& m, sql_type const&)
+      traverse_integer (type&, sql_type const&)
       {
         os << traits << "::set_image (" << endl
            << "i." << var << "value, is_null, " << member << ");"
@@ -396,7 +396,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_float (type& m, sql_type const&)
+      traverse_float (type&, sql_type const&)
       {
         os << traits << "::set_image (" << endl
            << "i." << var << "value, is_null, " << member << ");"
@@ -405,7 +405,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_decimal (type& m, sql_type const&)
+      traverse_decimal (type&, sql_type const&)
       {
         // @@ Optimization: can remove growth check if buffer is fixed.
         //
@@ -424,7 +424,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_date_time (type& m, sql_type const&)
+      traverse_date_time (type&, sql_type const&)
       {
         os << traits << "::set_image (" << endl
            << "i." << var << "value, is_null, " << member << ");"
@@ -433,7 +433,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_short_string (type& m, sql_type const&)
+      traverse_short_string (type&, sql_type const&)
       {
         // @@ Optimization: can remove growth check if buffer is fixed.
         //
@@ -452,7 +452,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_long_string (type& m, sql_type const&)
+      traverse_long_string (type&, sql_type const&)
       {
         os << "{"
            << "std::size_t size;"
@@ -469,7 +469,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_bit (type& m, sql_type const&)
+      traverse_bit (type&, sql_type const&)
       {
         // Represented as a BLOB.
         //
@@ -487,7 +487,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_enum (type& m, sql_type const&)
+      traverse_enum (type&, sql_type const&)
       {
         // Represented as a string.
         //
@@ -506,7 +506,7 @@ namespace mysql
       }
 
       virtual void
-      traverse_set (type& m, sql_type const&)
+      traverse_set (type&, sql_type const&)
       {
         // Represented as a string.
         //
-- 
cgit v1.1