Rev 123: Added declared exceptions to Ndb.i in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 123
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Wed 2007-07-18 09:59:21 -0700
message:
  Added declared exceptions to Ndb.i
modified:
  swig/Ndb.i                     ndb.i-20070228021421-qkr4cbpxymyqdrf3-1
=== modified file 'swig/Ndb.i'
--- a/swig/Ndb.i	2007-07-18 16:34:19 +0000
+++ b/swig/Ndb.i	2007-07-18 16:59:21 +0000
@@ -25,6 +25,7 @@
       const char* aCatalogName = "", const char* aSchemaName = "def");
   ~Ndb();
 
+  %ndbnoexception; 
   // These are not expected to fail
   const NdbError & getNdbError() const;
   const NdbError & getNdbError(int errorCode);
@@ -34,6 +35,8 @@
   const char * getDatabaseSchemaName() const;
   void setDatabaseSchemaName(const char * aDatabaseSchemaName);
 
+  NdbEventOperation *nextEvent();
+
 
   %ndbexception("NdbApiException") { 
     $action
@@ -43,9 +46,10 @@
       }
   }
   int dropEventOperation(NdbEventOperation* eventOp);
-  int  sendPollNdb(int aMillisecondNumber = WAITFOR_RESPONSE_TIMEOUT,
-		   int minNoOfEventsToWakeup = 1,
-		   int forceSend = 0);
+  int sendPollNdb(int aMillisecondNumber = WAITFOR_RESPONSE_TIMEOUT,
+		  int minNoOfEventsToWakeup = 1,
+		  int forceSend = 0);
+//  int pollEvents(int aMillisecondNumber, Uint64 *latestGCI= 0);
 
   %ndbexception("NdbApiException") { 
     $action
@@ -58,7 +62,14 @@
                                    const char  *keyData = 0, 
                                    Uint32       keyLen = 0);
 
-  %exception init { 
+  class NdbDictDictionary* getDictionary();
+  NdbEventOperation* createEventOperation(const char* eventName);
+//  const NdbEventOperation*
+//    getGCIEventOperations(Uint32* iter, Uint32* event_types);
+
+
+
+  %ndbexception("NdbApiException") init { 
     $action
       if (result) { 
 	NDB_exception(NdbApiException,"Cluster not ready");
@@ -66,7 +77,7 @@
   }
   int init(int maxNoOfTransactions = 4);
 
-  %exception getAutoIncrementValue {
+  %ndbexception("NdbApiException") getAutoIncrementValue {
     $action
       if (result == 0) { 
 	NdbError err = arg1->getNdbError();
@@ -80,19 +91,6 @@
   int getAutoIncrementValue(const NdbDictTable * aTable, 
                             Uint64 & OUTPUT, Uint32 cacheSize);
 
-  class NdbDictDictionary* getDictionary();
-
-/* Events */
-
-  NdbEventOperation* createEventOperation(const char* eventName);
-
-//  int pollEvents(int aMillisecondNumber, Uint64 *latestGCI= 0);
-
-%ndbnoexception nextEvent; 
-
-  NdbEventOperation *nextEvent();
-//  const NdbEventOperation*
-//    getGCIEventOperations(Uint32* iter, Uint32* event_types);