diff options
Diffstat (limited to 'math/goblin/files/patch-managedObject')
-rw-r--r-- | math/goblin/files/patch-managedObject | 364 |
1 files changed, 0 insertions, 364 deletions
diff --git a/math/goblin/files/patch-managedObject b/math/goblin/files/patch-managedObject deleted file mode 100644 index 2aab0444ebb0..000000000000 --- a/math/goblin/files/patch-managedObject +++ /dev/null @@ -1,364 +0,0 @@ ---- include/managedObject.h.orig 2013-06-05 09:27:06.000000000 +0200 -+++ include/managedObject.h 2013-06-05 09:27:19.000000000 +0200 -@@ -193,8 +193,8 @@ - }; - - --#define InternalError(scope,event) {sprintf(this->CT.logBuffer,"%s (%s, line: %d)",event,__FILE__,__LINE__); Error(ERR_INTERNAL,scope,this->CT.logBuffer);} --#define InternalError1(scope) {sprintf(this->CT.logBuffer,"%s (%s, line: %d)",this->CT.logBuffer,__FILE__,__LINE__); Error(ERR_INTERNAL,scope,this->CT.logBuffer);} -+#define InternalError(scope,event) {sprintf(this->CT.logBuffer,"%s (%s, line: %d)",event,__FILE__,__LINE__); this->Error(ERR_INTERNAL,scope,this->CT.logBuffer);} -+#define InternalError1(scope) {sprintf(this->CT.logBuffer,"%s (%s, line: %d)",this->CT.logBuffer,__FILE__,__LINE__); this->Error(ERR_INTERNAL,scope,this->CT.logBuffer);} - - - #endif ---- lib_src/dynamicStack.cpp.orig 2013-06-05 09:24:05.000000000 +0200 -+++ lib_src/dynamicStack.cpp 2013-06-05 09:23:48.000000000 +0200 -@@ -97,7 +97,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - #endif - ---- lib_src/dynamicQueue.cpp.orig 2013-06-05 09:24:43.000000000 +0200 -+++ lib_src/dynamicQueue.cpp 2013-06-05 09:24:50.000000000 +0200 -@@ -97,7 +97,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - #endif - ---- lib_src/fibonacciHeap.cpp.orig 2013-06-05 09:25:25.000000000 +0200 -+++ lib_src/fibonacciHeap.cpp 2013-06-05 09:29:46.000000000 +0200 -@@ -194,7 +194,7 @@ - { - #if defined(_FAILSAVE_) - -- if (v>=n || status[v]==NOT_QUEUED) NoSuchItem("Display",v); -+ if (v>=n || status[v]==NOT_QUEUED) this->NoSuchItem("Display",v); - - #endif - -@@ -267,7 +267,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - #endif - -@@ -281,13 +281,13 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - if (status[w]!=NOT_QUEUED) - { - sprintf(this->CT.logBuffer,"Already on queue: %lu", - static_cast<unsigned long>(w)); -- Error(ERR_REJECTED,"Insert",this->CT.logBuffer); -+ this->Error(ERR_REJECTED,"Insert",this->CT.logBuffer); - } - - #endif -@@ -394,7 +394,7 @@ - { - #if defined(_FAILSAVE_) - -- if (v>=n) NoSuchItem("Link",v); -+ if (v>=n) this->NoSuchItem("Link",v); - - if (status[v]!=ROOT_NODE) - { -@@ -403,7 +403,7 @@ - this -> Error(ERR_REJECTED,"Link",this->CT.logBuffer); - } - -- if (w>=n) NoSuchItem("Link",w); -+ if (w>=n) this->NoSuchItem("Link",w); - - if (status[w]!=ROOT_NODE) - { -@@ -459,7 +459,7 @@ - { - #if defined(_FAILSAVE_) - -- if (v>=n) NoSuchItem("Cut",v); -+ if (v>=n) this->NoSuchItem("Cut",v); - - if (status[v]!=UNMARKED_CHILD && status[v]!=MARKED_CHILD) - { -@@ -514,7 +514,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || status[w]==NOT_QUEUED) NoSuchItem("Delete",w); -+ if (w>=n || status[w]==NOT_QUEUED) this->NoSuchItem("Delete",w); - - #endif - -@@ -586,7 +586,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || status[w]==NOT_QUEUED) NoSuchItem("Key",w); -+ if (w>=n || status[w]==NOT_QUEUED) this->NoSuchItem("Key",w); - - #endif - -@@ -599,7 +599,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || status[w]==NOT_QUEUED) NoSuchItem("ChangeKey",w); -+ if (w>=n || status[w]==NOT_QUEUED) this->NoSuchItem("ChangeKey",w); - - #endif - ---- lib_src/basicHeap.cpp.orig 2013-06-05 09:30:16.000000000 +0200 -+++ lib_src/basicHeap.cpp 2013-06-05 09:31:06.000000000 +0200 -@@ -140,7 +140,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - if (maxIndex>=n) - this -> Error(ERR_REJECTED,"Insert","Buffer is full"); -@@ -187,7 +187,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Delete",w); -+ if (w>=n) this->NoSuchItem("Delete",w); - - #endif - -@@ -199,7 +199,7 @@ - { - sprintf(this->CT.logBuffer,"Not a member: %lu", - static_cast<unsigned long>(w)); -- Error(ERR_REJECTED,"Delete",this->CT.logBuffer); -+ this->Error(ERR_REJECTED,"Delete",this->CT.logBuffer); - } - - #endif -@@ -244,7 +244,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Key",w); -+ if (w>=n) this->NoSuchItem("Key",w); - - #endif - -@@ -257,13 +257,13 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("ChangeKey",w); -+ if (w>=n) this->NoSuchItem("ChangeKey",w); - - if (key[w]==InfFloat) - { - sprintf(this->CT.logBuffer,"Not a member: %lu", - static_cast<unsigned long>(w)); -- Error(ERR_REJECTED,"ChangeKey",this->CT.logBuffer); -+ this->Error(ERR_REJECTED,"ChangeKey",this->CT.logBuffer); - } - - #endif ---- lib_src/binaryHeap.cpp.orig 2013-06-05 09:31:39.000000000 +0200 -+++ lib_src/binaryHeap.cpp 2013-06-05 09:34:23.000000000 +0200 -@@ -142,7 +142,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>maxIndex || i==0) NoSuchIndex("Display",i); -+ if (i>maxIndex || i==0) this->NoSuchIndex("Display",i); - - if (i!=index[v[i]]) - { -@@ -201,7 +201,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>maxIndex || i==0) NoSuchIndex("UpHeap",i); -+ if (i>maxIndex || i==0) this->NoSuchIndex("UpHeap",i); - - #endif - -@@ -226,7 +226,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>maxIndex || i==0) NoSuchIndex("DownHeap",i); -+ if (i>maxIndex || i==0) this->NoSuchIndex("DownHeap",i); - - #endif - -@@ -262,7 +262,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchIndex("Insert",w); -+ if (w>=n) this->NoSuchIndex("Insert",w); - - if (maxIndex>=n) this -> Error(ERR_REJECTED,"Insert","Heap overflow"); - -@@ -299,7 +299,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || index[w]==UITEM_MAX()) NoSuchItem("Delete",w); -+ if (w>=n || index[w]==UITEM_MAX()) this->NoSuchItem("Delete",w); - - #endif - -@@ -381,7 +381,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || index[w]==UITEM_MAX()) NoSuchItem("Key",w); -+ if (w>=n || index[w]==UITEM_MAX()) this->NoSuchItem("Key",w); - - #endif - -@@ -394,7 +394,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n || index[w]==UITEM_MAX()) NoSuchItem("ChangeKey",w); -+ if (w>=n || index[w]==UITEM_MAX()) this->NoSuchItem("ChangeKey",w); - - #endif - ---- lib_src/matrix.cpp.orig 2013-06-05 09:34:55.000000000 +0200 -+++ lib_src/matrix.cpp 2013-06-05 09:36:49.000000000 +0200 -@@ -291,10 +291,10 @@ - { - #if defined(_FAILSAVE_) - -- if (!this->transp && i>=this->k) NoSuchIndex("Coeff",i); -- if (!this->transp && j>=this->l) NoSuchIndex("Coeff",j); -- if (this->transp && i>=this->l) NoSuchIndex("Coeff",i); -- if (this->transp && j>=this->k) NoSuchIndex("Coeff",j); -+ if (!this->transp && i>=this->k) this->NoSuchIndex("Coeff",i); -+ if (!this->transp && j>=this->l) this->NoSuchIndex("Coeff",j); -+ if (this->transp && i>=this->l) this->NoSuchIndex("Coeff",i); -+ if (this->transp && j>=this->k) this->NoSuchIndex("Coeff",j); - - #endif - -@@ -309,10 +309,10 @@ - { - #if defined(_FAILSAVE_) - -- if (!this->transp && i>=this->k) NoSuchIndex("Coeff",i); -- if (!this->transp && j>=this->l) NoSuchIndex("Coeff",j); -- if (this->transp && i>=this->l) NoSuchIndex("SetCoeff",i); -- if (this->transp && j>=this->k) NoSuchIndex("SetCoeff",j); -+ if (!this->transp && i>=this->k) this->NoSuchIndex("Coeff",i); -+ if (!this->transp && j>=this->l) this->NoSuchIndex("Coeff",j); -+ if (this->transp && i>=this->l) this->NoSuchIndex("SetCoeff",i); -+ if (this->transp && j>=this->k) this->NoSuchIndex("SetCoeff",j); - - if (a>=InfFloat || a<=-InfFloat) - this->Error(ERR_RANGE,"SetCoeff","Finite matrix coefficients required"); -@@ -388,10 +388,10 @@ - { - #if defined(_FAILSAVE_) - -- if (!this->transp && i>=this->k) NoSuchIndex("Coeff",i); -- if (!this->transp && j>=this->l) NoSuchIndex("Coeff",j); -- if (this->transp && i>=this->l) NoSuchIndex("Coeff",i); -- if (this->transp && j>=this->k) NoSuchIndex("Coeff",j); -+ if (!this->transp && i>=this->k) this->NoSuchIndex("Coeff",i); -+ if (!this->transp && j>=this->l) this->NoSuchIndex("Coeff",j); -+ if (this->transp && i>=this->l) this->NoSuchIndex("Coeff",i); -+ if (this->transp && j>=this->k) this->NoSuchIndex("Coeff",j); - - #endif - -@@ -406,10 +406,10 @@ - { - #if defined(_FAILSAVE_) - -- if (!this->transp && i>=this->k) NoSuchIndex("SetCoeff",i); -- if (!this->transp && j>=this->l) NoSuchIndex("SetCoeff",j); -- if (this->transp && i>=this->l) NoSuchIndex("SetCoeff",i); -- if (this->transp && j>=this->k) NoSuchIndex("SetCoeff",j); -+ if (!this->transp && i>=this->k) this->NoSuchIndex("SetCoeff",i); -+ if (!this->transp && j>=this->l) this->NoSuchIndex("SetCoeff",j); -+ if (this->transp && i>=this->l) this->NoSuchIndex("SetCoeff",i); -+ if (this->transp && j>=this->k) this->NoSuchIndex("SetCoeff",j); - - if (a>=InfFloat || a<=-InfFloat) - this->Error(ERR_RANGE,"SetCoeff","Finite matrix coefficients required"); ---- lib_src/staticStack.cpp.orig 2013-06-05 09:43:13.000000000 +0200 -+++ lib_src/staticStack.cpp 2013-06-05 09:44:06.000000000 +0200 -@@ -143,7 +143,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - #endif - -@@ -246,7 +246,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>=n) NoSuchItem("IsMember",i); -+ if (i>=n) this->NoSuchItem("IsMember",i); - - #endif - -@@ -272,7 +272,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>=n) NoSuchItem("Successor",i); -+ if (i>=n) this->NoSuchItem("Successor",i); - - #endif - ---- lib_src/staticQueue.cpp.orig 2013-06-05 09:45:07.000000000 +0200 -+++ lib_src/staticQueue.cpp 2013-06-05 09:45:38.000000000 +0200 -@@ -143,7 +143,7 @@ - { - #if defined(_FAILSAVE_) - -- if (w>=n) NoSuchItem("Insert",w); -+ if (w>=n) this->NoSuchItem("Insert",w); - - #endif - -@@ -248,7 +248,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>=n) NoSuchItem("IsMember",i); -+ if (i>=n) this->NoSuchItem("IsMember",i); - - #endif - -@@ -272,7 +272,7 @@ - { - #if defined(_FAILSAVE_) - -- if (i>=n) NoSuchItem("Successor",i); -+ if (i>=n) this->NoSuchItem("Successor",i); - - #endif - |