From 43d7ff0fab23ce678a47a9b2ed3431515beeed25 Mon Sep 17 00:00:00 2001 From: Johann Friedrichs Date: Sat, 22 May 2021 13:06:17 +0200 Subject: Fix compiling with gcc11 - thanks to Martin Dummer --- afuzzy.c | 16 ++++++++-------- conflictcheck.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/afuzzy.c b/afuzzy.c index 25d434c..61e8b90 100644 --- a/afuzzy.c +++ b/afuzzy.c @@ -194,8 +194,8 @@ ALGORITHM ******************************************************************************/ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy) { - register char c; - register int j, d; + char c; + int j, d; /* For eficciency this case should be little bit optimized */ if (!fuzzy->k) { @@ -207,7 +207,7 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy) if (R1 & fuzzy->mask_ok) return 1; - } /* end for (register int j = 0 ... */ + } /* end for (int j = 0 ... */ return 0; } @@ -229,16 +229,16 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy) memcpy(fuzzy->R, fuzzy->R1, fuzzy->r_size); - } /* end for (register int j = 0 ... */ + } /* end for (int j = 0 ... */ return 0; } static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) { - register Uint FilterR = 0; - register Uint FilterR1; - register int j; + Uint FilterR = 0; + Uint FilterR1; + int j; for (j = 0; t[j] != '\0'; j++) { FilterR1 = (((FilterR << (fuzzy->k + 1)) | fuzzy->filter_shift) & @@ -246,7 +246,7 @@ static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) if (FilterR1 & fuzzy->filter_ok) return 1; FilterR = FilterR1; - } /* end for (register int j = 0 ... */ + } /* end for (int j = 0 ... */ return 0; } diff --git a/conflictcheck.h b/conflictcheck.h index 6da8972..2b9cda4 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -70,7 +70,7 @@ public: class TimerObjSort { public: - bool operator()(cConflictCheckTimerObj* a, cConflictCheckTimerObj* b) { + bool operator()(const cConflictCheckTimerObj* a, const cConflictCheckTimerObj* b) const { return (a->Compare(*b) < 0); } }; -- cgit v1.2.3