mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20603) -Codechange: silence some ICC warnings

release/1.1
rubidium 2010-08-23 22:03:36 +00:00
parent 09d109a787
commit da4dc61f76
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.lib
View File

@ -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"

2
src/misc/dbg_helpers.h
View File

@ -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);

2
src/order_backup.h
View File

@ -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