From 8e83f9516418c9f16751c516c552f1b26c96be40 Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Sat, 22 Sep 2018 09:45:43 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into development

---
 include/etl/basic_string.h        | 5 +++++
 include/etl/memory.h              | 2 +-
 include/etl/private/pvoidvector.h | 5 +++++
 include/etl/vector.h              | 7 ++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h
index b823293d..d7536fea 100644
--- a/include/etl/basic_string.h
+++ b/include/etl/basic_string.h
@@ -54,6 +54,7 @@ SOFTWARE.
 #define ETL_FILE "27"
 
 #ifdef ETL_COMPILER_GCC
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
@@ -2232,6 +2233,10 @@ namespace etl
 
 #include "private/minmax_pop.h"
 
+#ifdef ETL_COMPILER_GCC
+#pragma GCC diagnostic pop
+#endif
+
 #undef ETL_FILE
 
 #endif
diff --git a/include/etl/memory.h b/include/etl/memory.h
index fca5ff44..0be98a1b 100644
--- a/include/etl/memory.h
+++ b/include/etl/memory.h
@@ -864,7 +864,7 @@ namespace etl
 
         pointer value = p;
         p = p_;
-        delete value;
+        deleter(value);
       }
 
       void swap(unique_ptr& value)
diff --git a/include/etl/private/pvoidvector.h b/include/etl/private/pvoidvector.h
index 1a03fb43..28fe1bd3 100644
--- a/include/etl/private/pvoidvector.h
+++ b/include/etl/private/pvoidvector.h
@@ -45,6 +45,7 @@ SOFTWARE.
 #include "../stl/iterator.h"
 
 #ifdef ETL_COMPILER_GCC
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
@@ -204,6 +205,10 @@ namespace etl
 
 #include "minmax_pop.h"
 
+#ifdef ETL_COMPILER_GCC
+#pragma GCC diagnostic pop
+#endif
+
 #undef ETL_IN_PVOIDVECTOR
 
 #endif
diff --git a/include/etl/vector.h b/include/etl/vector.h
index 12059dd0..3e0f9a2d 100644
--- a/include/etl/vector.h
+++ b/include/etl/vector.h
@@ -59,7 +59,8 @@ SOFTWARE.
 #endif
 
 #ifdef ETL_COMPILER_GCC
-  #pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
 //*****************************************************************************
@@ -1223,4 +1224,8 @@ namespace etl
 
 #include "private/ivectorpointer.h"
 
+#ifdef ETL_COMPILER_GCC
+#pragma GCC diagnostic pop
+#endif
+
 #endif