From 96de926c20acf3cb47b7f60ca769cfa7b78f11b7 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 16 Oct 2014 11:14:48 -0700
Subject: Tweak for travis

---
 src/compat/nullpo.hpp | 2 +-
 src/diagnostics.hpp   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3-70-g09d2