Mercurial > hg > openttd
changeset 15919:67d05b4e7503 draft
(svn r20603) -Codechange: silence some ICC warnings
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 23 Aug 2010 22:03:36 +0000 |
| parents | cb631c63789f |
| children | 74e5e0907a80 |
| files | config.lib src/misc/dbg_helpers.h src/order_backup.h |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -1134,7 +1134,8 @@ 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"
--- a/src/misc/dbg_helpers.h +++ b/src/misc/dbg_helpers.h @@ -79,7 +79,7 @@ } 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);
--- a/src/order_backup.h +++ b/src/order_backup.h @@ -29,7 +29,7 @@ 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