From 1cc5fee5904832da6564f12c858423fd5bd1b2b6 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Tue, 22 Apr 2014 17:14:28 -0700
Subject: Make travis happy

---
 src/compat/attr.hpp   | 2 +-
 src/compat/cast.hpp   | 2 +-
 src/compat/fun.hpp    | 5 +----
 src/compat/iter.hpp   | 2 +-
 src/compat/memory.hpp | 2 +-
 src/compat/nullpo.hpp | 2 +-
 src/compat/rawmem.hpp | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/compat')

diff --git a/src/compat/attr.hpp b/src/compat/attr.hpp
index ea7ba86..531e6b4 100644
--- a/src/compat/attr.hpp
+++ b/src/compat/attr.hpp
@@ -19,7 +19,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 
 # ifdef __clang__
diff --git a/src/compat/cast.hpp b/src/compat/cast.hpp
index 8db486f..b237df4 100644
--- a/src/compat/cast.hpp
+++ b/src/compat/cast.hpp
@@ -19,7 +19,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 # include <utility>
 # include <type_traits>
diff --git a/src/compat/fun.hpp b/src/compat/fun.hpp
index 005f2c5..072bda0 100644
--- a/src/compat/fun.hpp
+++ b/src/compat/fun.hpp
@@ -19,13 +19,10 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 # include <functional>
 
-# include "../sanity.hpp"
-
-
 namespace ph = std::placeholders;
 
 #endif // TMWA_COMPAT_FUN_HPP
diff --git a/src/compat/iter.hpp b/src/compat/iter.hpp
index 7793d90..130bdf9 100644
--- a/src/compat/iter.hpp
+++ b/src/compat/iter.hpp
@@ -19,7 +19,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 # include <iterator>
 
diff --git a/src/compat/memory.hpp b/src/compat/memory.hpp
index 2c0f742..8cafcb4 100644
--- a/src/compat/memory.hpp
+++ b/src/compat/memory.hpp
@@ -19,7 +19,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 # include <memory>
 
diff --git a/src/compat/nullpo.hpp b/src/compat/nullpo.hpp
index 75f8110..d6e39a5 100644
--- a/src/compat/nullpo.hpp
+++ b/src/compat/nullpo.hpp
@@ -41,7 +41,7 @@
 # define nullpo_ret(t) nullpo_retr(0, t)
 # define nullpo_retv(t) nullpo_retr(, t)
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 /// Used by macros in this header
 bool nullpo_chk(const char *file, int line, const char *func,
diff --git a/src/compat/rawmem.hpp b/src/compat/rawmem.hpp
index bbe917c..f030963 100644
--- a/src/compat/rawmem.hpp
+++ b/src/compat/rawmem.hpp
@@ -23,7 +23,7 @@
 # include <cstdint>
 # include <cstring>
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 inline
 void really_memcpy(uint8_t *dest, const uint8_t *src, size_t n)
-- 
cgit v1.2.3-60-g2f50