cpp/openttd-patchpack/source Changeset - r15909:371b0c8f4ce6

Changeset - r15909:371b0c8f4ce6

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-08-23 22:03:36
rubidium@openttd.org

(svn r20603) -Codechange: silence some ICC warnings

3 files changed with 4 insertions and 3 deletions:

config.lib

src/misc/dbg_helpers.h

src/order_backup.h

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

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

src/misc/dbg_helpers.h

➞

Show inline comments

@@ @@ -79,7 +79,7 @@ inline CStrA ComposeNameT(E value, T &t, @@
 	} 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);

src/order_backup.h

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ typedef Pool<OrderBackup, OrderBackupID, @@
 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

0 comments (0 inline, 0 general)