Merge branch 'cpp-11' into save_ext

2017-08-15 18:44:36 +01:00
parent 843343fcf1 f3a0aace0c
commit 258e591f71
69 changed files with 385 additions and 214 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -183,7 +183,8 @@ static int ParseIntList(const char *p, int *items, int maxitems)
 				/* Do not accept multiple commas between numbers */
 				if (!comma) return -1;
 				comma = false;
-				/* FALL THROUGH */
+				FALLTHROUGH;
+
 			case ' ':
 				p++;
 				break;