diff options
| author | frosch <frosch@openttd.org> | 2016-09-05 19:11:01 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2016-09-05 19:11:01 +0000 |
| commit | ac6793dace47b46d1375afa2d3fc4ca4aba0587a (patch) | |
| tree | aa896b9fc68b3a450a38b66fd3e2332f28f96cc3 | |
| parent | 0adfb1ac6f8fa99ede48daaebd5fc4184c9797e3 (diff) | |
| download | openttd-ac6793dace47b46d1375afa2d3fc4ca4aba0587a.tar.xz | |
(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)
| -rw-r--r-- | config.lib | 7 | ||||
| -rw-r--r-- | src/table/newgrf_debug_data.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/config.lib b/config.lib index ab9bb82b6..a144b9e3e 100644 --- a/config.lib +++ b/config.lib @@ -1285,7 +1285,7 @@ make_compiler_cflags() { # -W alone doesn't enable all warnings enabled by -Wall; on the other hand, # -Weverything enables too many useless warnings that can't be disabled (as of 3.0) - flags="$flags -Wall -W" + flags="$flags -Wall -W -Wextra" # warning: unused parameter '...' flags="$flags -Wno-unused-parameter" @@ -1326,6 +1326,11 @@ make_compiler_cflags() { flags="$flags -Wno-unused-variable" fi + if [ "$cc_version" -ge "33" ]; then + # clang completed C++11 support in version 3.3 + flags="$flags -std=c++11" + fi + # rdynamic is used to get useful stack traces from crash reports. ldflags="$ldflags -rdynamic" else diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h index b7d0c9202..afe19bbed 100644 --- a/src/table/newgrf_debug_data.h +++ b/src/table/newgrf_debug_data.h @@ -17,7 +17,7 @@ #define NIP_END() { NULL, 0, 0, 0, 0 } /* Helper for filling callback tables */ -#define NIC(cb_id, base, variable, bit) { #cb_id, cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id } +#define NIC(cb_id, base, variable, bit) { #cb_id, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id } #define NIC_END() { NULL, 0, 0, 0, 0 } /* Helper for filling variable tables */ |