diff options
| -rw-r--r-- | config.lib | 3 | ||||
| -rw-r--r-- | src/misc/dbg_helpers.h | 2 | ||||
| -rw-r--r-- | src/order_backup.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config.lib b/config.lib index cd0b459f5..1afbdb931 100644 --- a/config.lib +++ b/config.lib @@ -1134,7 +1134,8 @@ make_compiler_cflags() { if [ $cc_version -ge 110 ]; then # vec report defaults to telling where it did loop vectorisation, which is not very important - flags="$flags -vec-report=0 -wd873" + # it also complains about not fully overriding virtual function + flags="$flags -vec-report=0 -wd873 -wd654" # Use c++0x mode so static_assert() is available cxxflags="$cxxflags -std=c++0x" diff --git a/src/misc/dbg_helpers.h b/src/misc/dbg_helpers.h index 379b2e82e..c83086f2a 100644 --- a/src/misc/dbg_helpers.h +++ b/src/misc/dbg_helpers.h @@ -79,7 +79,7 @@ inline CStrA ComposeNameT(E value, T &t, const char *t_unk, E val_inv, const cha } else { for (size_t i = 0; i < ArrayT<T>::length; i++) { if ((value & (1 << i)) == 0) continue; - out.AddFormat("%s%s", (out.Size() > 0 ? "+" : ""), t[i]); + out.AddFormat("%s%s", (out.Size() > 0 ? "+" : ""), (const char*)t[i]); value &= ~(E)(1 << i); } if (value != 0) out.AddFormat("%s%s", (out.Size() > 0 ? "+" : ""), t_unk); diff --git a/src/order_backup.h b/src/order_backup.h index 15a9d0bc1..81d485eb7 100644 --- a/src/order_backup.h +++ b/src/order_backup.h @@ -29,7 +29,7 @@ typedef Pool<OrderBackup, OrderBackupID, 1, 256> OrderBackupPool; extern OrderBackupPool _order_backup_pool; /** Flag to pass to the vehicle construction command when an order should be preserved. */ -static const uint32 MAKE_ORDER_BACKUP_FLAG = 1 << 31; +static const uint32 MAKE_ORDER_BACKUP_FLAG = 1U << 31; /** * Data for backing up an order of a vehicle so it can be |