summaryrefslogtreecommitdiff
path: root/sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch')
-rw-r--r--sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch b/sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch
new file mode 100644
index 000000000000..c05a280d4679
--- /dev/null
+++ b/sci-biology/elph/files/elph-1.0.1-drop-register-keyword.patch
@@ -0,0 +1,102 @@
+Bug: https://bugs.gentoo.org/898116
+
+--- a/GBase.cpp
++++ b/GBase.cpp
+@@ -208,8 +208,8 @@ char* rstrstr(char* rstart, char *lend, char* substr) { /*like strstr, but star
+
+ //hash function used for strings in GHash
+ int strhash(const char* str){
+- register int h=0;
+- register int g;
++ int h=0;
++ int g;
+ while (*str) {
+ h=(h<<4)+*str++;
+ g=h&0xF0000000;
+--- a/GString.cpp
++++ b/GString.cpp
+@@ -364,8 +364,8 @@ GString& GString::appendfmt(const char *fmt,...) {
+ }
+
+ GString& GString::trim(char c) {
+- register int istart;
+- register int iend;
++ int istart;
++ int iend;
+ for (istart=0; istart<length() && chars()[istart]==c;istart++);
+ if (istart==length()) {
+ make_unique(); //edit operation ahead
+@@ -384,8 +384,8 @@ GString& GString::trim(char c) {
+ }
+
+ GString& GString::trim(char* c) {
+- register int istart;
+- register int iend;
++ int istart;
++ int iend;
+ for (istart=0; istart<length() && strchr(c, chars()[istart])!=NULL ;istart++);
+ if (istart==length()) {
+ replace_data(0); //string was entirely trimmed
+@@ -405,7 +405,7 @@ GString& GString::trim(char* c) {
+ GString& GString::trimR(char c) {
+ //only trim the right end
+ //register int istart;
+- register int iend;
++ int iend;
+ for (iend=length()-1; iend>=0 && chars()[iend]==c;iend--);
+ if (iend==-1) {
+ replace_data(0); //string was entirely trimmed
+@@ -423,7 +423,7 @@ GString& GString::trimR(char c) {
+ }
+
+ GString& GString::trimR(char* c) {
+- register int iend;
++ int iend;
+ for (iend=length()-1; iend>=0 && strchr(c,chars()[iend])!=NULL;iend--);
+ if (iend==-1) {
+ replace_data(0); //string was entirely trimmed
+@@ -440,7 +440,7 @@ GString& GString::trimR(char* c) {
+ }
+
+ GString& GString::trimL(char c) {
+- register int istart;
++ int istart;
+ for (istart=0; istart<length() && chars()[istart]==c;istart++);
+ if (istart==length()) {
+ replace_data(0); //string was entirely trimmed
+@@ -457,7 +457,7 @@ GString& GString::trimL(char c) {
+ }
+
+ GString& GString::trimL(char* c) {
+- register int istart;
++ int istart;
+ for (istart=0; istart<length() && strchr(c,chars()[istart])!=NULL;istart++);
+ if (istart==length()) {
+ replace_data(0); //string was entirely trimmed
+@@ -598,7 +598,7 @@ bool GString::is_space() const {
+ if (my_data == &null_data)
+ return false;
+
+- for (register const char *p = chars(); *p; p++)
++ for (const char *p = chars(); *p; p++)
+ if (!isspace(*p))
+ return false;
+
+@@ -889,7 +889,7 @@ GString& GString::append(const GString& s) {
+
+ GString& GString::upper() {
+ make_unique(); //edit operation ahead
+- for (register char *p = chrs(); *p; p++)
++ for (char *p = chrs(); *p; p++)
+ *p = (char) toupper(*p);
+
+ return *this;
+@@ -900,7 +900,7 @@ GString& GString::upper() {
+ GString& GString::lower() {
+ make_unique();
+
+- for (register char *p = chrs(); *p; p++)
++ for (char *p = chrs(); *p; p++)
+ *p = (char) tolower(*p);
+
+ return *this;