(svn r20603) -Codechange: silence some ICC warnings
This commit is contained in:
@@ -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);
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user