From 9803bf8bde12bf2050011e329af7d9b8c7fd5894 Mon Sep 17 00:00:00 2001
From: John Wellbelove <smartgit@wellbelove.co.uk>
Date: Mon, 18 Feb 2019 19:32:02 +0100
Subject: [PATCH] Fix inconsistent ETL_FILE definitions

---
 include/etl/basic_string.h        | 1 +
 include/etl/intrusive_queue.h     | 1 +
 include/etl/intrusive_stack.h     | 1 +
 include/etl/private/vector_base.h | 1 +
 include/etl/queue_mpmc_mutex.h    | 2 ++
 include/etl/queue_spsc_atomic.h   | 2 ++
 include/etl/queue_spsc_isr.h      | 2 ++
 include/etl/stack.h               | 1 +
 include/etl/version.h             | 2 +-
 support/Release notes.txt         | 4 ++++
 10 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h
index d7536fea..54d2d545 100644
--- a/include/etl/basic_string.h
+++ b/include/etl/basic_string.h
@@ -51,6 +51,7 @@ SOFTWARE.
 #include "integral_limits.h"
 #include "exception.h"
 
+#undef ETL_FILE
 #define ETL_FILE "27"
 
 #ifdef ETL_COMPILER_GCC
diff --git a/include/etl/intrusive_queue.h b/include/etl/intrusive_queue.h
index 48885fac..1b0113ac 100644
--- a/include/etl/intrusive_queue.h
+++ b/include/etl/intrusive_queue.h
@@ -38,6 +38,7 @@ SOFTWARE.
 #include "error_handler.h"
 #include "intrusive_links.h"
 
+#undef ETL_FILE
 #define ETL_FILE "29"
 
 namespace etl
diff --git a/include/etl/intrusive_stack.h b/include/etl/intrusive_stack.h
index 8f7bfe40..e2837f4e 100644
--- a/include/etl/intrusive_stack.h
+++ b/include/etl/intrusive_stack.h
@@ -38,6 +38,7 @@ SOFTWARE.
 #include "error_handler.h"
 #include "intrusive_links.h"
 
+#undef ETL_FILE
 #define ETL_FILE "28"
 
 namespace etl
diff --git a/include/etl/private/vector_base.h b/include/etl/private/vector_base.h
index 2b68f481..d4487ac3 100644
--- a/include/etl/private/vector_base.h
+++ b/include/etl/private/vector_base.h
@@ -42,6 +42,7 @@ SOFTWARE.
 #include "../error_handler.h"
 #include "../debug_count.h"
 
+#undef ETL_FILE
 #define ETL_FILE "17"
 
 namespace etl
diff --git a/include/etl/queue_mpmc_mutex.h b/include/etl/queue_mpmc_mutex.h
index 72c3f80e..2c6c8a8b 100644
--- a/include/etl/queue_mpmc_mutex.h
+++ b/include/etl/queue_mpmc_mutex.h
@@ -584,4 +584,6 @@ namespace etl
   };
 }
 
+#undef ETL_FILE
+
 #endif
diff --git a/include/etl/queue_spsc_atomic.h b/include/etl/queue_spsc_atomic.h
index e7c3d743..acbf8304 100644
--- a/include/etl/queue_spsc_atomic.h
+++ b/include/etl/queue_spsc_atomic.h
@@ -471,4 +471,6 @@ namespace etl
   };
 }
 
+#undef ETL_FILE
+
 #endif
diff --git a/include/etl/queue_spsc_isr.h b/include/etl/queue_spsc_isr.h
index bb9c530e..8842af48 100644
--- a/include/etl/queue_spsc_isr.h
+++ b/include/etl/queue_spsc_isr.h
@@ -678,4 +678,6 @@ namespace etl
   };
 }
 
+#undef ETL_FILE
+
 #endif
diff --git a/include/etl/stack.h b/include/etl/stack.h
index ee372178..20e2a35b 100644
--- a/include/etl/stack.h
+++ b/include/etl/stack.h
@@ -48,6 +48,7 @@ SOFTWARE.
 #include "parameter_type.h"
 #include "type_traits.h"
 
+#undef ETL_FILE
 #define ETL_FILE "15"
 
 //*****************************************************************************
diff --git a/include/etl/version.h b/include/etl/version.h
index 75c9a4ae..9cb4c071 100644
--- a/include/etl/version.h
+++ b/include/etl/version.h
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 14
 #define ETL_VERSION_MINOR 11
-#define ETL_VERSION_PATCH  1
+#define ETL_VERSION_PATCH  2
 
 #define ETL_VERSION       ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))
diff --git a/support/Release notes.txt b/support/Release notes.txt
index 82374276..c9d15c8a 100644
--- a/support/Release notes.txt	
+++ b/support/Release notes.txt	
@@ -1,3 +1,7 @@
+===============================================================================
+14.11.2
+Fix inconsistent ETL_FILE definitions.
+
 ===============================================================================
 14.11.1
 Fix 'force C++03' macros leftover from testing.