bzr commit into NDB/Bindings:trunk branch (monty:450)

[Monty Taylor]

#At https://bazaar.launchpad.net/~ndb-bindings/ndb-bindings/trunk

  450 Monty Taylor	2008-08-19
      Removed ifdef Ruby renames so that ruby names will be the same as other languages.
modified:
  interface/ndbapi/NdbClusterConnection.i
  interface/ndbapi/NdbIndexScanOperation.i
  interface/ndbapi/NdbRecAttr.i
  interface/ndbapi/NdbScanFilter.i
  interface/ndbapi/NdbTransaction.i

=== modified file 'interface/ndbapi/NdbClusterConnection.i'
--- a/interface/ndbapi/NdbClusterConnection.i	2008-08-19 06:56:32 +0000
+++ b/interface/ndbapi/NdbClusterConnection.i	2008-08-20 05:35:55 +0000
@@ -41,11 +41,9 @@ public:
   }
   Ndb_cluster_connection(const char * connectstring = 0);
 
-#if !defined(SWIG_RUBY_AUTORENAME)
   %rename("setName") set_name;
   %rename("waitUntilReady") wait_until_ready;
   %rename("setTimeout") set_timeout;
-#endif
 
   %ndbnoexception;
 

=== modified file 'interface/ndbapi/NdbIndexScanOperation.i'
--- a/interface/ndbapi/NdbIndexScanOperation.i	2008-07-09 20:42:18 +0000
+++ b/interface/ndbapi/NdbIndexScanOperation.i	2008-08-20 05:35:55 +0000
@@ -47,9 +47,7 @@ public:
       }
   }
 
-#if !defined(SWIG_RUBY_AUTORENAME)
   %rename(getRangeNo) get_range_no;
-#endif
 
   voidint get_range_no();
 

=== modified file 'interface/ndbapi/NdbRecAttr.i'
--- a/interface/ndbapi/NdbRecAttr.i	2008-08-19 03:48:28 +0000
+++ b/interface/ndbapi/NdbRecAttr.i	2008-08-20 05:35:55 +0000
@@ -30,7 +30,6 @@ public:
 
   int isNULL();
 
-#if !defined(SWIG_RUBY_AUTORENAME)
   %rename(getLong) int64_value();
   %rename(getInt) int32_value();
   %rename(getShort) short_value();
@@ -41,19 +40,6 @@ public:
   %rename(getUchar) u_char_value() const;
   %rename(getFloat) float_value() const;
   %rename(getDouble) double_value() const;
-#else
-  %rename(get_long) int64_value();
-  %rename(get_int) int32_value();
-  %rename(get_short) short_value();
-  %rename(get_char)  char_value();
-  %rename(get_ulong) u_64_value() const;
-  %rename(get_uint) u_32_value();
-  %rename(get_ushort) u_short_value() const;
-  %rename(get_uchar) u_char_value() const;
-  %rename(get_float) float_value() const;
-  %rename(get_double) double_value() const;
-  %rename(getSizeInBytes) get_size_in_bytes() const;
-#endif
 
   %ndbexception("NdbApiException") {
     $action

=== modified file 'interface/ndbapi/NdbScanFilter.i'
--- a/interface/ndbapi/NdbScanFilter.i	2008-07-09 20:42:18 +0000
+++ b/interface/ndbapi/NdbScanFilter.i	2008-08-20 05:35:55 +0000
@@ -111,17 +111,10 @@ public:
   int end();
 
   /** @} *********************************************************************/
-#if defined(SWIG_RUBY_AUTORENAME)
-  %rename("is_true?") istrue;
-  %rename("is_false?") isfalse;
-  %rename("is_null?") isnull;
-  %rename("is_not_null?") isnotnull;
-#else
   %rename("isTrue") istrue;
   %rename("isFalse") isfalse;
   %rename("isNull") isnull;
   %rename("isNotNull") isnotnull;
-#endif
 
   /**
    *  <i>Explanation missing</i>

=== modified file 'interface/ndbapi/NdbTransaction.i'
--- a/interface/ndbapi/NdbTransaction.i	2008-08-09 16:54:30 +0000
+++ b/interface/ndbapi/NdbTransaction.i	2008-08-20 05:35:55 +0000
@@ -115,6 +115,8 @@ public:
 
   %ndbnoexception;
 
+  void close();
+
   Uint64 getTransactionId();
   CommitStatusType commitStatus();
 
@@ -127,13 +129,7 @@ public:
   %ndbnoexception;
 
   ~NdbTransaction() {
-    if(self!=0)
-      self->close();
-  }
-
-  void close() {
-    if(self!=0)
-      self->close();
+    self->close();
   }
 
   bool isClosed() {