bzr commit into mysql-5.1-telco-6.2 branch (monty:2643)

[Monty Taylor]

#At http://bazaar.launchpad.net/~mordred/mysql-server/5.1-telco-6.2

 2643 Monty Taylor	2008-08-06
      Replaced GCC specific unused marking with (void) casts.
modified:
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
  storage/ndb/include/ndbapi/NdbOperation.hpp
  storage/ndb/include/ndbapi/NdbTransaction.hpp

=== modified file 'storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-07 01:34:35 +0000
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-07 06:24:52 +0000
@@ -307,16 +307,18 @@ private:
 inline
 int
 NdbIndexScanOperation::setBound(const char* attr, int type, const void* value,
-                                __attribute__((__unused__))Uint32 len)
+                                Uint32 len)
 {
+  (void)len;  // unused
   return setBound(attr, type, value);
 }
 
 inline
 int
 NdbIndexScanOperation::setBound(Uint32 anAttrId, int type, const void* value,
-                                __attribute__((__unused__))Uint32 len)
+                                Uint32 len)
 {
+  (void)len;  // unused
   return setBound(anAttrId, type, value);
 }
 

=== modified file 'storage/ndb/include/ndbapi/NdbOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbOperation.hpp	2008-08-07 01:34:35 +0000
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp	2008-08-07 06:24:52 +0000
@@ -1570,8 +1570,9 @@ NdbOperation::NdbCon(NdbTransaction* aNd
 inline
 int
 NdbOperation::equal(const char* anAttrName, const char* aValue,
-                    __attribute__((__unused__))Uint32 len)
+                    Uint32 len)
 {
+  (void)len;   // unused
   return equal(anAttrName, aValue);
 }
 
@@ -1606,8 +1607,9 @@ NdbOperation::equal(const char* anAttrNa
 inline
 int
 NdbOperation::equal(Uint32 anAttrId, const char* aValue,
-                    __attribute__((__unused__))Uint32 len)
+                    Uint32 len)
 {
+  (void)len;   // unused
   return equal(anAttrId, aValue);
 }
 
@@ -1642,8 +1644,9 @@ NdbOperation::equal(Uint32 anAttrId, Uin
 inline
 int
 NdbOperation::setValue(const char* anAttrName, const char* aValue,
-                       __attribute__((__unused__))Uint32 len)
+                       Uint32 len)
 {
+  (void)len;   // unused
   return setValue(anAttrName, aValue);
 }
 
@@ -1692,8 +1695,9 @@ NdbOperation::setValue(const char* anAtt
 inline
 int
 NdbOperation::setValue(Uint32 anAttrId, const char* aValue,
-                       __attribute__((__unused__))Uint32 len)
+                       Uint32 len)
 {
+  (void)len;   // unused
   return setValue(anAttrId, aValue);
 }
 

=== modified file 'storage/ndb/include/ndbapi/NdbTransaction.hpp'
--- a/storage/ndb/include/ndbapi/NdbTransaction.hpp	2008-08-07 01:34:35 +0000
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp	2008-08-07 06:24:52 +0000
@@ -1091,8 +1091,9 @@ NdbTransaction::get_send_size()
 
 inline
 void
-NdbTransaction::set_send_size(__attribute__((__unused__))Uint32 send_size)
+NdbTransaction::set_send_size(Uint32 send_size)
 {
+  (void)send_size; //unused
   return;
 }