diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-16 11:14:48 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-16 11:50:42 -0700 |
| commit | 96de926c20acf3cb47b7f60ca769cfa7b78f11b7 (patch) | |
| tree | 933d0d78d8542ab11900cca4cd34f834c4abe182 /src | |
| parent | e5549ae35fed284799115aed7e67049e5107c988 (diff) | |
| download | tmwa-96de926c20acf3cb47b7f60ca769cfa7b78f11b7.tar.gz tmwa-96de926c20acf3cb47b7f60ca769cfa7b78f11b7.tar.bz2 tmwa-96de926c20acf3cb47b7f60ca769cfa7b78f11b7.tar.xz tmwa-96de926c20acf3cb47b7f60ca769cfa7b78f11b7.zip | |
Tweak for travis
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat/nullpo.hpp | 2 | ||||
| -rw-r--r-- | src/diagnostics.hpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compat/nullpo.hpp b/src/compat/nullpo.hpp index 718c7aa..668f0a2 100644 --- a/src/compat/nullpo.hpp +++ b/src/compat/nullpo.hpp @@ -52,7 +52,7 @@ bool nullpo_chk(const char *file, int line, const char *func, const void *target); template<class T> -bool nullpo_chk(const char *file, int line, const char *func, Borrowed<T> target) = delete; +bool nullpo_chk(const char *, int, const char *, Borrowed<T>) = delete; template<class T> bool nullpo_chk(const char *file, int line, const char *func, T target) { diff --git a/src/diagnostics.hpp b/src/diagnostics.hpp index dab15b5..5eee323 100644 --- a/src/diagnostics.hpp +++ b/src/diagnostics.hpp @@ -600,7 +600,8 @@ namespace tmwa /// Warn about maybe uninitialized automatic variables #define DIAG_maybe_uninitialized "-Wmaybe-uninitialized" -#if GCC >= 407 +// buggy in 4.7 with tmwa::Option<> +#if GCC >= 408 # define HAS_DIAG_maybe_uninitialized 1 #else # define HAS_DIAG_maybe_uninitialized 0 |