From c279c0ce03d98ea8a34eddd966f4e82af68a4e2b Mon Sep 17 00:00:00 2001
From: John Wellbelove <smartgit@wellbelove.co.uk>
Date: Fri, 11 Dec 2015 19:01:12 +0000
Subject: [PATCH] Modified error_handler include.

---
 private/flat_multimap_base.h | 9 +++------
 private/flat_multiset_base.h | 6 +++---
 private/flat_set_base.h      | 9 +++------
 private/forward_list_base.h  | 2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/private/flat_multimap_base.h b/private/flat_multimap_base.h
index 9a054b97..ed4e3a8d 100644
--- a/private/flat_multimap_base.h
+++ b/private/flat_multimap_base.h
@@ -36,12 +36,9 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
-#include "ivector.h"
-
-#ifndef ETL_THROW_EXCEPTIONS
-#include "error_handler.h"
-#endif
+#include "../exception.h"
+#include "../ivector.h"
+#include "../error_handler.h"
 
 namespace etl
 {
diff --git a/private/flat_multiset_base.h b/private/flat_multiset_base.h
index b67e7fb1..ce24b1ac 100644
--- a/private/flat_multiset_base.h
+++ b/private/flat_multiset_base.h
@@ -36,9 +36,9 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
-#include "ivector.h"
-#include "error_handler.h"
+#include "../exception.h"
+#include "../ivector.h"
+#include "../error_handler.h"
 
 namespace etl
 {
diff --git a/private/flat_set_base.h b/private/flat_set_base.h
index b87a40ac..67e6bf21 100644
--- a/private/flat_set_base.h
+++ b/private/flat_set_base.h
@@ -36,12 +36,9 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
-#include "ivector.h"
-
-#ifndef ETL_THROW_EXCEPTIONS
-#include "error_handler.h"
-#endif
+#include "../exception.h"
+#include "../ivector.h"
+#include "../error_handler.h"
 
 namespace etl
 {
diff --git a/private/forward_list_base.h b/private/forward_list_base.h
index cb764730..be7cb516 100644
--- a/private/forward_list_base.h
+++ b/private/forward_list_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_LIST_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {