diff options
Diffstat (limited to 'sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch')
| -rw-r--r-- | sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch | 121 |
1 files changed, 0 insertions, 121 deletions
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch deleted file mode 100644 index 48fe6e10ac96..000000000000 --- a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch +++ /dev/null @@ -1,121 +0,0 @@ -Author: Alex Mestiashvili <mailatgoogl@gmail.com> -Origin: https://lists.debian.org/debian-med/2017/09/msg00021.html -Bug-Debian: https://bugs.debian.org/871234 -Description: Fix gcc-7 build issue, thanks to Jeff Epler <jepler@unpythonic.net> ---- a/src/GHash.hh -+++ b/src/GHash.hh -@@ -88,7 +88,7 @@ - //nextkey is SET to the corresponding key - GHashEntry* NextEntry() { //returns a pointer to a GHashEntry - register int pos=fCurrentEntry; -- while (pos<fCapacity && hash[pos].hash<0) pos++; -+ while (pos<fCapacity && (hash[pos].hash)<0) pos++; - if (pos==fCapacity) { - fCurrentEntry=fCapacity; - return NULL; -@@ -186,7 +186,7 @@ - x=HASH2(h,n); - GASSERT(1<=x && x<n); - while(k[p].hash!=-1) p=(p+x)%n; -- GASSERT(k[p].hash<0); -+ GASSERT((k[p].hash)<0); - k[p]=hash[i]; - } - } -@@ -225,7 +225,7 @@ - GTRACE(("GHash::insert: key=\"%s\"\n",ky)); - //GMessage("GHash::insert: key=\"%s\"\n",ky); - GASSERT(0<=i && i<fCapacity); -- GASSERT(hash[i].hash<0); -+ GASSERT((hash[i].hash)<0); - hash[i].hash=h; - hash[i].mark=mrk; - hash[i].key=Gstrdup(ky); -@@ -266,7 +266,7 @@ - GTRACE(("GHash::insert: key=\"%s\"\n",ky)); - //GMessage("GHash::insert: key=\"%s\"\n",ky); - GASSERT(0<=i && i<fCapacity); -- GASSERT(hash[i].hash<0); -+ GASSERT((hash[i].hash)<0); - hash[i].hash=h; - hash[i].mark=mrk; - hash[i].key=(char *)ky; -@@ -310,7 +310,7 @@ - if(i==-1) i=p; - GTRACE(("GHash::replace: %08x: inserting: \"%s\"\n",this,ky)); - GASSERT(0<=i && i<fCapacity); -- GASSERT(hash[i].hash<0); -+ GASSERT((hash[i].hash)<0); - hash[i].hash=h; - hash[i].mark=mrk; - hash[i].key=Gstrdup(ky); -@@ -412,7 +412,7 @@ - - template <class OBJ> char* GHash<OBJ>::NextKey() { - register int pos=fCurrentEntry; -- while (pos<fCapacity && hash[pos].hash<0) pos++; -+ while (pos<fCapacity && (hash[pos].hash)<0) pos++; - if (pos==fCapacity) { - fCurrentEntry=fCapacity; - return NULL; -@@ -425,7 +425,7 @@ - - template <class OBJ> OBJ* GHash<OBJ>::NextData() { - register int pos=fCurrentEntry; -- while (pos<fCapacity && hash[pos].hash<0) pos++; -+ while (pos<fCapacity && (hash[pos].hash)<0) pos++; - if (pos==fCapacity) { - fCurrentEntry=fCapacity; - return NULL; -@@ -439,7 +439,7 @@ - - template <class OBJ> OBJ* GHash<OBJ>::NextData(char* &nextkey) { - register int pos=fCurrentEntry; -- while (pos<fCapacity && hash[pos].hash<0) pos++; -+ while (pos<fCapacity && (hash[pos].hash)<0) pos++; - if (pos==fCapacity) { - fCurrentEntry=fCapacity; - nextkey=NULL; -@@ -457,16 +457,16 @@ - // Get first non-empty entry - template <class OBJ> int GHash<OBJ>::First() const { - register int pos=0; -- while(pos<fCapacity){ if(0<=hash[pos].hash) break; pos++; } -- GASSERT(fCapacity<=pos || 0<=hash[pos].hash); -+ while(pos<fCapacity){ if(0<=(hash[pos].hash)) break; pos++; } -+ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash)); - return pos; - } - - // Get last non-empty entry - template <class OBJ> int GHash<OBJ>::Last() const { - register int pos=fCapacity-1; -- while(0<=pos){ if(0<=hash[pos].hash) break; pos--; } -- GASSERT(pos<0 || 0<=hash[pos].hash); -+ while(0<=pos){ if(0<=(hash[pos].hash)) break; pos--; } -+ GASSERT(pos<0 || 0<=(hash[pos].hash)); - return pos; - } - -@@ -474,8 +474,8 @@ - // Find next valid entry - template <class OBJ> int GHash<OBJ>::Next(int pos) const { - GASSERT(0<=pos && pos<fCapacity); -- while(++pos <= fCapacity-1){ if(0<=hash[pos].hash) break; } -- GASSERT(fCapacity<=pos || 0<=hash[pos].hash); -+ while(++pos <= fCapacity-1){ if(0<=(hash[pos].hash)) break; } -+ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash)); - return pos; - } - -@@ -483,8 +483,8 @@ - // Find previous valid entry - template <class OBJ> int GHash<OBJ>::Prev(int pos) const { - GASSERT(0<=pos && pos<fCapacity); -- while(--pos >= 0){ if(0<=hash[pos].hash) break; } -- GASSERT(pos<0 || 0<=hash[pos].hash); -+ while(--pos >= 0){ if(0<=(hash[pos].hash)) break; } -+ GASSERT(pos<0 || 0<=(hash[pos].hash)); - return pos; - } - |