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
---
.travis.yml | 6 +++---
src/compat/nullpo.hpp | 2 +-
src/diagnostics.hpp | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3c3236a..3986b9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,16 +77,16 @@ env:
matrix:
allow_failures:
- compiler: clang
- env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 DEBUGPACKAGE=libstdc++6-4.6-dbg
+ env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 DEBUGPACKAGE=libstdc++6-4.6-dbg
exclude:
- env: ignore=this
include:
- - compiler: clang
- env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 DEBUGPACKAGE=libstdc++6-4.6-dbg
- compiler: clang
env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 DEBUGPACKAGE=libstdc++6-4.6-dbg
- compiler: clang
env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.4 DEBUGPACKAGE=libstdc++6-4.6-dbg
+ - compiler: clang
+ env: REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.5 DEBUGPACKAGE=libstdc++6-4.6-dbg
- compiler: gcc
env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 DEBUGPACKAGE=libstdc++6-4.8-dbg
- compiler: gcc
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