diff options
| author | smatz <smatz@openttd.org> | 2009-09-07 21:01:24 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-09-07 21:01:24 +0000 |
| commit | 434693b8389a5816d73f089e064819a19f76f798 (patch) | |
| tree | 4f28bf30f0060e2ec00959a48f107162314ff499 /src | |
| parent | fe7032a7a6efdd19b38a5a79b5a36bbe4cfdc6e7 (diff) | |
| download | openttd-434693b8389a5816d73f089e064819a19f76f798.tar.xz | |
(svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/signal.cpp | 20 | ||||
| -rw-r--r-- | src/table/build_industry.h | 2 | ||||
| -rw-r--r-- | src/table/settings.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/signal.cpp b/src/signal.cpp index 22adaf26c..b85c38636 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -29,19 +29,19 @@ enum { assert_compile(SIG_GLOB_UPDATE <= SIG_GLOB_SIZE); /** incidating trackbits with given enterdir */ -static const TrackBitsByte _enterdir_to_trackbits[DIAGDIR_END] = { - {TRACK_BIT_3WAY_NE}, - {TRACK_BIT_3WAY_SE}, - {TRACK_BIT_3WAY_SW}, - {TRACK_BIT_3WAY_NW} +static const TrackBits _enterdir_to_trackbits[DIAGDIR_END] = { + TRACK_BIT_3WAY_NE, + TRACK_BIT_3WAY_SE, + TRACK_BIT_3WAY_SW, + TRACK_BIT_3WAY_NW }; /** incidating trackdirbits with given enterdir */ -static const TrackdirBitsShort _enterdir_to_trackdirbits[DIAGDIR_END] = { - {TRACKDIR_BIT_X_SW | TRACKDIR_BIT_UPPER_W | TRACKDIR_BIT_RIGHT_S}, - {TRACKDIR_BIT_Y_NW | TRACKDIR_BIT_LOWER_W | TRACKDIR_BIT_RIGHT_N}, - {TRACKDIR_BIT_X_NE | TRACKDIR_BIT_LOWER_E | TRACKDIR_BIT_LEFT_N}, - {TRACKDIR_BIT_Y_SE | TRACKDIR_BIT_UPPER_E | TRACKDIR_BIT_LEFT_S} +static const TrackdirBits _enterdir_to_trackdirbits[DIAGDIR_END] = { + TRACKDIR_BIT_X_SW | TRACKDIR_BIT_UPPER_W | TRACKDIR_BIT_RIGHT_S, + TRACKDIR_BIT_Y_NW | TRACKDIR_BIT_LOWER_W | TRACKDIR_BIT_RIGHT_N, + TRACKDIR_BIT_X_NE | TRACKDIR_BIT_LOWER_E | TRACKDIR_BIT_LEFT_N, + TRACKDIR_BIT_Y_SE | TRACKDIR_BIT_UPPER_E | TRACKDIR_BIT_LEFT_S }; /** diff --git a/src/table/build_industry.h b/src/table/build_industry.h index e45c25c06..47b16c48e 100644 --- a/src/table/build_industry.h +++ b/src/table/build_industry.h @@ -1182,7 +1182,7 @@ enum { #define MI(tbl, sndc, snd, d, pc, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col, \ c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \ - {tbl, lengthof(tbl), min(255, d), 0, d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ + {tbl, lengthof(tbl), (uint8)min(255, d), 0, d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, in, intx, s1, s2, s3, STR_UNDEFINED, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \ sndc, snd, 0, 0, true, {INVALID_INDUSTRYTYPE, 0, NULL, NULL, INVALID_INDUSTRYTYPE}} /* Format: diff --git a/src/table/settings.h b/src/table/settings.h index 4fa1a872b..1f832dbc6 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -83,7 +83,7 @@ static bool UpdateClientConfigValues(int32 p1); */ #define NSD_GENERAL(name, def, cmd, guiflags, min, max, interval, many, str, proc, load)\ - {name, (const void*)(def), {cmd}, {guiflags}, min, max, interval, many, str, proc, load} + {name, (const void*)(def), {(byte)cmd}, {(byte)guiflags}, min, max, interval, many, str, proc, load} /* Macros for various objects to go in the configuration file. * This section is for global variables */ |