diff --git a/include/etl/array_view.h b/include/etl/array_view.h
index 09cbef77..a2507020 100644
--- a/include/etl/array_view.h
+++ b/include/etl/array_view.h
@@ -47,7 +47,7 @@ SOFTWARE.
 ///\ingroup containers
 
 #undef ETL_FILE
-#define ETL_FILE "41"
+#define ETL_FILE ETL_ARRAY_VIEW_FILE_ID
 
 namespace etl
 {
diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h
index 48cf87e2..e4b8246d 100644
--- a/include/etl/circular_buffer.h
+++ b/include/etl/circular_buffer.h
@@ -1067,7 +1067,7 @@ namespace etl
     /// Constructor.
     /// Constructs a buffer from an iterator range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     circular_buffer(TIterator first, const TIterator& last)
       : icircular_buffer<T>(reinterpret_cast<T*>(buffer.raw), MAX_SIZE)
     {
@@ -1184,7 +1184,7 @@ namespace etl
     /// Constructor.
     /// Constructs a buffer from an iterator range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     circular_buffer_ext(TIterator first, const TIterator& last, void* buffer, size_t max_size)
       : icircular_buffer<T>(reinterpret_cast<T*>(buffer), max_size)
     {
diff --git a/include/etl/delegate.h b/include/etl/delegate.h
index 2c407fd4..4c5ee7d0 100644
--- a/include/etl/delegate.h
+++ b/include/etl/delegate.h
@@ -58,7 +58,7 @@ Original publication: https://www.codeproject.com/Articles/1170503/The-Impossibl
 #endif
 
 #undef ETL_FILE
-#define ETL_FILE "51"
+#define ETL_FILE ETL_DELEGATE_FILE_ID
 
 namespace etl
 {
diff --git a/include/etl/deque.h b/include/etl/deque.h
index 5e7c93d1..9afbba61 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -2383,7 +2383,7 @@ namespace etl
     //*************************************************************************
     /// Assigns data to the deque.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     deque(TIterator begin_, TIterator end_)
       : etl::ideque<T>(reinterpret_cast<T*>(buffer.raw), MAX_SIZE, BUFFER_SIZE)
     {
diff --git a/include/etl/file_error_numbers.h b/include/etl/file_error_numbers.h
index a894f04b..88c5280b 100644
--- a/include/etl/file_error_numbers.h
+++ b/include/etl/file_error_numbers.h
@@ -31,65 +31,65 @@ SOFTWARE.
 #ifndef ETL_FILE_ERROR_NUMBERS
 #define ETL_FILE_ERROR_NUMBERS
 
-#define ETL_DEQUE_ID "1"
-#define ETL_FLAT_MAP_ID "2"
-#define ETL_FLAT_MULTIMAP_ID "3"
-#define ETL_FLAT_MULTISET_ID "4"
-#define ETL_FLAT_SET_ID "5"
-#define ETL_FORWARD_LIST_ID "6"
-#define ETL_LIST_ID "7"
-#define ETL_MAP_ID "8"
-#define ETL_MULTIMAP_ID "9"
-#define ETL_MULTISET_ID "10"
-#define ETL_POOL_ID "11"
-#define ETL_PRIORITY_QUEUE_ID "12"
-#define ETL_QUEUE_ID "13"
-#define ETL_SET_ID "14"
-#define ETL_STACK_ID "15"
-#define ETL_UNORDERED_MAP_ID "16"
-#define ETL_VECTOR_ID "17"
-#define ETL_OBSERVER_ID "18"
-#define ETL_IHASH_ID "19"
-#define ETL_INTRUSIVE_FORWARD_LIST_ID "20"
-#define ETL_INTRUSIVE_LIST_ID "21"
-#define ETL_INTRUSIVE_LINKS_ID "22"
-#define ETL_UNORDERED_SET_ID "23"
-#define ETL_VARIANT_ID "24"
-#define ETL_UNORDERED_MULTIMAP_ID "25"
-#define ETL_UNORDERED_MULTISET_ID "26"
-#define ETL_BASIC_STRING_ID "27"
-#define ETL_INTRUSIVE_STACK_ID "28"
-#define ETL_INTRUSIVE_QUEUE_ID "29"
-#define ETL_REFERENCE_FLAT_MAP_ID "30"
-#define ETL_REFERENCE_FLAT_MULTIMAP_ID "31"
-#define ETL_REFERENCE_FLAT_SET_ID "32"
-#define ETL_REFERENCE_FLAT_MULTISET_ID "33"
-#define ETL_FSM_ID "34"
-#define ETL_MESSAGE_ROUTER_ID "35"
-#define ETL_SCHEDULER_ID "36"
-#define ETL_TASK_ID "37"
-#define ETL_MESSAGE_ID "38"
-#define ETL_MESSAGE_BUS_ID "39"
-#define ETL_VARIANT_POOL_ID "40"
-#define ETL_ARRAY_VIEW_ID "41"
-#define ETL_STRING_VIEW_ID "42"
-#define ETL_CALLBACK_TIMER_ID "43"
-#define ETL_MESSAGE_TIMER_ID "44"
-#define ETL_TYPE_LOOKUP_ID "45"
-#define ETL_QUEUE_SPSC_ISR_ID "46"
-#define ETL_QUEUE_SPSC_ATOMIC_ID "47"
-#define ETL_QUEUE_MPMC_MUTEX_ID "48"
-#define ETL_TYPE_SELECT_ID "49"
-#define ETL_BINARY_ID "50"
-#define ETL_DELEGATE_ID "51"
-#define ETL_BITSET_ID "52"
-#define ETL_INDIRECT_VECTOR_ID "53"
-#define ETL_QUEUE_SPSC_LOCKED_ID "54"
-#define ETL_MESSAGE_PACKET_ID "55"
-#define ETL_CIRCULAR_BUFFER_ID "56"
-#define ETL_MULTI_LOOP_ID "57"
-#define ETL_REFERENCE_COUNTER_MESSAGE_POOL_ID "58"
-#define ETL_QUEUE_SPSC_LOCKABLE "59"
-#define ETL_MESSAGE_ROUTER_REGISTRY "60"
+#define ETL_DEQUE_FILE_ID "1"
+#define ETL_FLAT_MAP_FILE_ID "2"
+#define ETL_FLAT_MULTIMAP_FILE_ID "3"
+#define ETL_FLAT_MULTISET_FILE_ID "4"
+#define ETL_FLAT_SET_FILE_ID "5"
+#define ETL_FORWARD_LIST_FILE_ID "6"
+#define ETL_LIST_FILE_ID "7"
+#define ETL_MAP_FILE_ID "8"
+#define ETL_MULTIMAP_FILE_ID "9"
+#define ETL_MULTISET_FILE_ID "10"
+#define ETL_POOL_FILE_ID "11"
+#define ETL_PRIORITY_QUEUE_FILE_ID "12"
+#define ETL_QUEUE_FILE_ID "13"
+#define ETL_SET_FILE_ID "14"
+#define ETL_STACK_FILE_ID "15"
+#define ETL_UNORDERED_MAP_FILE_ID "16"
+#define ETL_VECTOR_FILE_ID "17"
+#define ETL_OBSERVER_FILE_ID "18"
+#define ETL_IHASH_FILE_ID "19"
+#define ETL_INTRUSIVE_FORWARD_LIST_FILE_ID "20"
+#define ETL_INTRUSIVE_LIST_FILE_ID "21"
+#define ETL_INTRUSIVE_LINKS_FILE_ID "22"
+#define ETL_UNORDERED_SET_FILE_ID "23"
+#define ETL_VARIANT_FILE_ID "24"
+#define ETL_UNORDERED_MULTIMAP_FILE_ID "25"
+#define ETL_UNORDERED_MULTISET_FILE_ID "26"
+#define ETL_BASIC_STRING_FILE_ID "27"
+#define ETL_INTRUSIVE_STACK_FILE_ID "28"
+#define ETL_INTRUSIVE_QUEUE_FILE_ID "29"
+#define ETL_REFERENCE_FLAT_MAP_FILE_ID "30"
+#define ETL_REFERENCE_FLAT_MULTIMAP_FILE_ID "31"
+#define ETL_REFERENCE_FLAT_SET_FILE_ID "32"
+#define ETL_REFERENCE_FLAT_MULTISET_FILE_ID "33"
+#define ETL_FSM_FILE_ID "34"
+#define ETL_MESSAGE_ROUTER_FILE_ID "35"
+#define ETL_SCHEDULER_FILE_ID "36"
+#define ETL_TASK_FILE_ID "37"
+#define ETL_MESSAGE_FILE_ID "38"
+#define ETL_MESSAGE_BUS_FILE_ID "39"
+#define ETL_VARIANT_POOL_FILE_ID "40"
+#define ETL_ARRAY_VIEW_FILE_ID "41"
+#define ETL_STRING_VIEW_FILE_ID "42"
+#define ETL_CALLBACK_TIMER_FILE_ID "43"
+#define ETL_MESSAGE_TIMER_FILE_ID "44"
+#define ETL_TYPE_LOOKUP_FILE_ID "45"
+#define ETL_QUEUE_SPSC_ISR_FILE_ID "46"
+#define ETL_QUEUE_SPSC_ATOMIC_FILE_ID "47"
+#define ETL_QUEUE_MPMC_MUTEX_FILE_ID "48"
+#define ETL_TYPE_SELECT_FILE_ID "49"
+#define ETL_BINARY_FILE_ID "50"
+#define ETL_DELEGATE_FILE_ID "51"
+#define ETL_BITSET_FILE_ID "52"
+#define ETL_INDIRECT_VECTOR_FILE_ID "53"
+#define ETL_QUEUE_SPSC_LOCKED_FILE_ID "54"
+#define ETL_MESSAGE_PACKET_FILE_ID "55"
+#define ETL_CIRCULAR_BUFFER_FILE_ID "56"
+#define ETL_MULTI_LOOP_FILE_ID "57"
+#define ETL_REFERENCE_COUNTER_MESSAGE_POOL_FILE_ID "58"
+#define ETL_QUEUE_SPSC_LOCKABLE_FILE_ID "59"
+#define ETL_MESSAGE_ROUTER_REGISTRY_FILE_ID "60"
 
 #endif
diff --git a/include/etl/flat_map.h b/include/etl/flat_map.h
index 027dbb13..4fc40714 100644
--- a/include/etl/flat_map.h
+++ b/include/etl/flat_map.h
@@ -939,7 +939,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     flat_map(TIterator first, TIterator last)
       : etl::iflat_map<TKey, TValue, TCompare>(lookup, storage)
     {
diff --git a/include/etl/flat_multimap.h b/include/etl/flat_multimap.h
index 579502ac..cea492f0 100644
--- a/include/etl/flat_multimap.h
+++ b/include/etl/flat_multimap.h
@@ -842,7 +842,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     flat_multimap(TIterator first, TIterator last)
       : etl::iflat_multimap<TKey, TValue, TCompare>(lookup, storage)
     {
diff --git a/include/etl/flat_multiset.h b/include/etl/flat_multiset.h
index 38645e02..2d7347cd 100644
--- a/include/etl/flat_multiset.h
+++ b/include/etl/flat_multiset.h
@@ -794,7 +794,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     flat_multiset(TIterator first, TIterator last)
       : iflat_multiset<T, TCompare>(lookup, storage)
     {
diff --git a/include/etl/flat_set.h b/include/etl/flat_set.h
index af3ee6f3..f2b1b3c1 100644
--- a/include/etl/flat_set.h
+++ b/include/etl/flat_set.h
@@ -879,7 +879,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     flat_set(TIterator first, TIterator last)
       : etl::iflat_set<T, TCompare>(lookup, storage)
     {
diff --git a/include/etl/forward_list.h b/include/etl/forward_list.h
index 4fcb9f2b..00e471fb 100644
--- a/include/etl/forward_list.h
+++ b/include/etl/forward_list.h
@@ -1676,7 +1676,7 @@ namespace etl
     //*************************************************************************
     /// Construct from range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     forward_list(TIterator first, TIterator last)
       : etl::iforward_list<T>(node_pool, MAX_SIZE, false)
     {
@@ -1837,7 +1837,7 @@ namespace etl
     //*************************************************************************
     /// Construct from range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     forward_list_ext(TIterator first, TIterator last, etl::ipool& node_pool)
       : etl::iforward_list<T>(node_pool, node_pool.max_size(), true)
     {
diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index bcfb6a99..02700c8b 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -517,7 +517,7 @@ namespace etl
     //*************************************************************************
     /// Constructor from range
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     intrusive_forward_list(TIterator first, TIterator last)
     {
       this->assign(first, last);
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index 85e09494..19594226 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -602,7 +602,7 @@ namespace etl
     //*************************************************************************
     /// Constructor from range
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     intrusive_list(TIterator first, TIterator last)
     {
       this->assign(first, last);
diff --git a/include/etl/list.h b/include/etl/list.h
index b625dd03..eb266e8b 100644
--- a/include/etl/list.h
+++ b/include/etl/list.h
@@ -2118,7 +2118,7 @@ namespace etl
     //*************************************************************************
     /// Construct from range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     list(TIterator first, TIterator last)
       : ilist<T>(node_pool, MAX_SIZE, false)
     {
@@ -2282,7 +2282,7 @@ namespace etl
     //*************************************************************************
     /// Construct from range.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     list_ext(TIterator first, TIterator last, etl::ipool& node_pool)
       : ilist<T>(node_pool, node_pool.max_size(), true)
     {
diff --git a/include/etl/map.h b/include/etl/map.h
index 7a684591..1e7efd66 100644
--- a/include/etl/map.h
+++ b/include/etl/map.h
@@ -2226,7 +2226,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     map(TIterator first, TIterator last)
       : etl::imap<TKey, TValue, TCompare>(node_pool, MAX_SIZE)
     {
diff --git a/include/etl/multimap.h b/include/etl/multimap.h
index c1282dc8..0fc1c4de 100644
--- a/include/etl/multimap.h
+++ b/include/etl/multimap.h
@@ -2088,7 +2088,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     multimap(TIterator first, TIterator last)
       : etl::imultimap<TKey, TValue, TCompare>(node_pool, MAX_SIZE)
     {
diff --git a/include/etl/multiset.h b/include/etl/multiset.h
index 3d602a17..b329759b 100644
--- a/include/etl/multiset.h
+++ b/include/etl/multiset.h
@@ -2069,7 +2069,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     multiset(TIterator first, TIterator last)
       : etl::imultiset<TKey, TCompare>(node_pool, MAX_SIZE)
     {
diff --git a/include/etl/priority_queue.h b/include/etl/priority_queue.h
index 3d4f5a7f..a3d27fbe 100644
--- a/include/etl/priority_queue.h
+++ b/include/etl/priority_queue.h
@@ -458,7 +458,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     priority_queue(TIterator first, TIterator last)
       : etl::ipriority_queue<T, TContainer, TCompare>()
     {
diff --git a/include/etl/private/crc16_poly_0x1021_.h b/include/etl/private/crc16_poly_0x1021_.h
index 4095f9fc..28da4f1a 100644
--- a/include/etl/private/crc16_poly_0x1021_.h
+++ b/include/etl/private/crc16_poly_0x1021_.h
@@ -179,7 +179,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc16_poly_0x1021(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/private/crc16_poly_0x8005.h b/include/etl/private/crc16_poly_0x8005.h
index 509547d2..129fa5f2 100644
--- a/include/etl/private/crc16_poly_0x8005.h
+++ b/include/etl/private/crc16_poly_0x8005.h
@@ -179,7 +179,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc16_poly_0x8005(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/private/crc32_poly_0x04c11db7.h b/include/etl/private/crc32_poly_0x04c11db7.h
index 5fa791f1..57a1acd2 100644
--- a/include/etl/private/crc32_poly_0x04c11db7.h
+++ b/include/etl/private/crc32_poly_0x04c11db7.h
@@ -179,7 +179,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc32_poly_0x04c11db7(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/private/crc32_poly_0x1edc6f41.h b/include/etl/private/crc32_poly_0x1edc6f41.h
index 832002a0..eedbfbab 100644
--- a/include/etl/private/crc32_poly_0x1edc6f41.h
+++ b/include/etl/private/crc32_poly_0x1edc6f41.h
@@ -179,7 +179,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc32_poly_0x1edc6f41(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/private/crc64_poly_0x42f0e1eba9ea3693.h b/include/etl/private/crc64_poly_0x42f0e1eba9ea3693.h
index a7bc7a86..12345d21 100644
--- a/include/etl/private/crc64_poly_0x42f0e1eba9ea3693.h
+++ b/include/etl/private/crc64_poly_0x42f0e1eba9ea3693.h
@@ -211,7 +211,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc64_poly_0x42f0e1eba9ea3693(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/private/crc8_poly_0x07.h b/include/etl/private/crc8_poly_0x07.h
index 1d2f778a..19772cba 100644
--- a/include/etl/private/crc8_poly_0x07.h
+++ b/include/etl/private/crc8_poly_0x07.h
@@ -179,7 +179,7 @@ namespace etl
     /// \param begin Start of the range.
     /// \param end   End of the range.
     //*************************************************************************
-    template<typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template<typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     crc8_poly_0x07(TIterator begin, const TIterator end)
     {
       this->reset();
diff --git a/include/etl/reference_flat_map.h b/include/etl/reference_flat_map.h
index aea1015d..8863073e 100644
--- a/include/etl/reference_flat_map.h
+++ b/include/etl/reference_flat_map.h
@@ -942,7 +942,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     reference_flat_map(TIterator first, TIterator last)
       : ireference_flat_map<TKey, TValue, TCompare>(lookup)
     {
diff --git a/include/etl/reference_flat_multimap.h b/include/etl/reference_flat_multimap.h
index 5fd35a38..5713fe1a 100644
--- a/include/etl/reference_flat_multimap.h
+++ b/include/etl/reference_flat_multimap.h
@@ -854,7 +854,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     reference_flat_multimap(TIterator first, TIterator last)
       : ireference_flat_multimap<TKey, TValue, TCompare>(lookup)
     {
diff --git a/include/etl/reference_flat_set.h b/include/etl/reference_flat_set.h
index ce75ac30..c35cf376 100644
--- a/include/etl/reference_flat_set.h
+++ b/include/etl/reference_flat_set.h
@@ -819,7 +819,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     reference_flat_set(TIterator first, TIterator last)
       : ireference_flat_set<TKey, TKeyCompare>(lookup)
     {
diff --git a/include/etl/set.h b/include/etl/set.h
index 9d62d81c..0b61b95f 100644
--- a/include/etl/set.h
+++ b/include/etl/set.h
@@ -2152,7 +2152,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     set(TIterator first, TIterator last)
       : etl::iset<TKey, TCompare>(node_pool, MAX_SIZE)
     {
diff --git a/include/etl/string.h b/include/etl/string.h
index 2d78aa1d..3c03c238 100644
--- a/include/etl/string.h
+++ b/include/etl/string.h
@@ -353,7 +353,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     string_ext(TIterator first, TIterator last, value_type* buffer, size_type buffer_size)
       : istring(buffer, buffer_size - 1U)
     {
diff --git a/include/etl/string_view.h b/include/etl/string_view.h
index 89b79540..e0ce6988 100644
--- a/include/etl/string_view.h
+++ b/include/etl/string_view.h
@@ -308,7 +308,7 @@ namespace etl
     //*************************************************************************
     /// Assign from iterators
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
       void assign(TIterator begin_, TIterator end_)
     {
       mbegin = etl::addressof(*begin_);
diff --git a/include/etl/u16string.h b/include/etl/u16string.h
index 8476aa42..bde90b3e 100644
--- a/include/etl/u16string.h
+++ b/include/etl/u16string.h
@@ -145,7 +145,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     u16string(TIterator first, TIterator last)
       : iu16string(reinterpret_cast<value_type*>(&buffer), MAX_SIZE)
     {
@@ -336,7 +336,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     u16string_ext(TIterator first, TIterator last, value_type* buffer, size_type buffer_size)
       : iu16string(buffer, buffer_size - 1U)
     {
diff --git a/include/etl/u32string.h b/include/etl/u32string.h
index fb698b97..43700cfb 100644
--- a/include/etl/u32string.h
+++ b/include/etl/u32string.h
@@ -145,7 +145,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     u32string(TIterator first, TIterator last)
       : iu32string(reinterpret_cast<value_type*>(&buffer), MAX_SIZE)
     {
@@ -336,7 +336,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     u32string_ext(TIterator first, TIterator last, value_type* buffer, size_type buffer_size)
       : iu32string(buffer, buffer_size - 1U)
     {
diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h
index 4b6574dd..8b3be14a 100644
--- a/include/etl/unordered_map.h
+++ b/include/etl/unordered_map.h
@@ -1584,7 +1584,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     unordered_map(TIterator first_, TIterator last_)
       : base(node_pool, buckets, MAX_BUCKETS_)
     {
diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h
index d92923cc..d2f63a9d 100644
--- a/include/etl/unordered_multimap.h
+++ b/include/etl/unordered_multimap.h
@@ -1495,7 +1495,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     unordered_multimap(TIterator first_, TIterator last_)
       : base(node_pool, buckets, MAX_BUCKETS)
     {
diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h
index b49e5dba..b1e0e1c4 100644
--- a/include/etl/unordered_multiset.h
+++ b/include/etl/unordered_multiset.h
@@ -1481,7 +1481,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     unordered_multiset(TIterator first_, TIterator last_)
       : base(node_pool, buckets, MAX_BUCKETS)
     {
diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h
index a6c63558..756da3e4 100644
--- a/include/etl/unordered_set.h
+++ b/include/etl/unordered_set.h
@@ -1479,7 +1479,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     unordered_set(TIterator first_, TIterator last_)
       : base(node_pool, buckets, MAX_BUCKETS)
     {
diff --git a/include/etl/vector.h b/include/etl/vector.h
index 863bad50..fcc3ef4f 100644
--- a/include/etl/vector.h
+++ b/include/etl/vector.h
@@ -1193,7 +1193,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     vector(TIterator first, TIterator last)
       : etl::ivector<T>(reinterpret_cast<T*>(&buffer), MAX_SIZE)
     {
@@ -1366,7 +1366,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     vector_ext(TIterator first, TIterator last, void* buffer, size_t max_size)
       : etl::ivector<T>(reinterpret_cast<T*>(buffer), max_size)
     {
@@ -1528,7 +1528,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     vector(TIterator first, TIterator last)
       : etl::ivector<T*>(reinterpret_cast<T**>(&buffer), MAX_SIZE)
     {
@@ -1660,7 +1660,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     vector_ext(TIterator first, TIterator last, void* buffer, size_t max_size)
       : etl::ivector<T*>(reinterpret_cast<T**>(buffer), max_size)
     {
diff --git a/include/etl/wstring.h b/include/etl/wstring.h
index 32d77f07..fb008655 100644
--- a/include/etl/wstring.h
+++ b/include/etl/wstring.h
@@ -145,7 +145,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     wstring(TIterator first, TIterator last)
       : iwstring(reinterpret_cast<value_type*>(&buffer), MAX_SIZE)
     {
@@ -336,7 +336,7 @@ namespace etl
     ///\param first The iterator to the first element.
     ///\param last  The iterator to the last element + 1.
     //*************************************************************************
-    template <typename TIterator, typename = typename etl::enable_if<!etl::is_integral<TIterator>::value, void>::type>
+    template <typename TIterator, typename etl::enable_if<!etl::is_integral<TIterator>::value, int>::type = 0>
     wstring_ext(TIterator first, TIterator last, value_type* buffer, size_type buffer_size)
       : iwstring(buffer, buffer_size - 1U)
     {