Modified error_handler include.

ownmac · Dec 11, 2015 · b055c37 · b055c37
1 parent 48919b3
commit b055c37
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 25 deletions.
diff --git a/private/list_base.h b/private/list_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_LIST_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/map_base.h b/private/map_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_MAP_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {
@@ -157,9 +157,12 @@ namespace etl
 
   protected:
 
-    static const uint8_t kLeft    = 0;
-    static const uint8_t kRight   = 1;
-    static const uint8_t kNeither = 2;
+    enum
+    {
+      kLeft    = 0,
+      kRight   = 1,
+      kNeither = 2
+    };
 
     //*************************************************************************
     /// The node element in the map.

diff --git a/private/multimap_base.h b/private/multimap_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_MULTIMAP_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/multiset_base.h b/private/multiset_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_MULTISET_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/pool_base.h b/private/pool_base.h
@@ -36,11 +36,8 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
-
-#ifndef ETL_THROW_EXCEPTIONS
-#include "error_handler.h"
-#endif
+#include "../exception.h"
+#include "../error_handler.h"
 
 namespace etl
 {

diff --git a/private/priority_queue_base.h b/private/priority_queue_base.h
@@ -36,7 +36,7 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/queue_base.h b/private/queue_base.h
@@ -36,7 +36,7 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {
@@ -68,6 +68,20 @@ namespace etl
     }
   };
 
+  //***************************************************************************
+  /// The exception thrown when the queue is empty.
+  ///\ingroup queue
+  //***************************************************************************
+  class queue_empty : public queue_exception
+  {
+  public:
+
+    queue_empty()
+      : queue_exception("queue: empty")
+    {
+    }
+  };
+
   //***************************************************************************
   /// The base class for all queues.
   ///\ingroup queue

diff --git a/private/set_base.h b/private/set_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_SET_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {
@@ -157,9 +157,12 @@ namespace etl
 
   protected:
 
-    static const uint8_t kLeft    = 0;
-    static const uint8_t kRight   = 1;
-    static const uint8_t kNeither = 2;
+    enum
+    {
+      kLeft    = 0,
+      kRight   = 1,
+      kNeither = 2
+    };
 
     //*************************************************************************
     /// The node element in the set.

diff --git a/private/stack_base.h b/private/stack_base.h
@@ -36,7 +36,7 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/unordered_map_base.h b/private/unordered_map_base.h
@@ -35,7 +35,7 @@ SOFTWARE.
 #define __ETL_UNORDERED_MAP_BASE__
 
 #include <stddef.h>
-#include "exception.h"
+#include "../exception.h"
 
 namespace etl
 {

diff --git a/private/vector_base.h b/private/vector_base.h
@@ -36,11 +36,8 @@ SOFTWARE.
 
 #include <stddef.h>
 
-#include "exception.h"
-
-#ifndef ETL_THROW_EXCEPTIONS
-#include "error_handler.h"
-#endif
+#include "../exception.h"
+#include "../error_handler.h"
 
 namespace etl
 {