Changeset: e37d105cf860 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e37d105cf860
Modified Files:
common/utils/mstring.h
Branch: Oct2020
Log Message:
Backed out changeset 78874f24d49c: with updated gcc it works fine again.
diffs (19 lines):
diff --git a/common/utils/mstring.h b/common/utils/mstring.h
--- a/common/utils/mstring.h
+++ b/common/utils/mstring.h
@@ -35,7 +35,6 @@ strcpy_len(char *restrict dst, const cha
* --enable-strict, so we just use the (more) expensive way of getting the
* right answer (rescan the whole string) */
#if !defined(__GNUC__) || __GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ > 5)
-#if __GNUC__ < 11
/* This code is correct, but GCC gives a warning in certain
* conditions, so we disable the warning temporarily.
* The warning happens e.g. in
@@ -51,7 +50,6 @@ GCC_Pragma("GCC diagnostic ignored \"-Wa
return n + strlen(src + n);
GCC_Pragma("GCC diagnostic pop")
#endif
-#endif
}
return strlen(src);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
