From 71d03fa8e2e9e01b9528856b4a43756297298ba0 Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Wed, 7 Apr 2021 10:29:57 +0100
Subject: [PATCH] Removed enable_if in maths algorithms

---
 include/etl/correlation.h        |  6 ++----
 include/etl/covariance.h         |  6 ++----
 include/etl/standard_deviation.h |  6 ++----
 include/etl/variance.h           |  6 ++----
 test/vs2019/etl.vcxproj          |  3 +++
 test/vs2019/etl.vcxproj.filters  | 24 +++++++++++++++---------
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/include/etl/correlation.h b/include/etl/correlation.h
index ccd61778..d825102d 100644
--- a/include/etl/correlation.h
+++ b/include/etl/correlation.h
@@ -185,8 +185,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      add(TIterator first1, TIterator last1, TIterator first2)
+    void add(TIterator first1, TIterator last1, TIterator first2)
     {
       while (first1 != last1)
       {
@@ -208,8 +207,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      operator ()(TIterator first1, TIterator last1, TIterator first2)
+    void operator ()(TIterator first1, TIterator last1, TIterator first2)
     {
       add(first1, last1, first2);
     }
diff --git a/include/etl/covariance.h b/include/etl/covariance.h
index 2b64b4c3..47de9ce2 100644
--- a/include/etl/covariance.h
+++ b/include/etl/covariance.h
@@ -171,8 +171,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      add(TIterator first1, TIterator last1, TIterator first2)
+    void add(TIterator first1, TIterator last1, TIterator first2)
     {
       while (first1 != last1)
       {
@@ -194,8 +193,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      operator ()(TIterator first1, TIterator last1, TIterator first2)
+    void operator ()(TIterator first1, TIterator last1, TIterator first2)
     {
       add(first1, last1, first2);
     }
diff --git a/include/etl/standard_deviation.h b/include/etl/standard_deviation.h
index 7929b17f..ab6cb527 100644
--- a/include/etl/standard_deviation.h
+++ b/include/etl/standard_deviation.h
@@ -164,8 +164,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      add(TIterator first, TIterator last)
+    void add(TIterator first, TIterator last)
     {
       while (first != last)
       {
@@ -187,8 +186,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      operator ()(TIterator first, TIterator last)
+    void operator ()(TIterator first, TIterator last)
     {
       add(first, last);
     }
diff --git a/include/etl/variance.h b/include/etl/variance.h
index 7558f54b..11b0ea4d 100644
--- a/include/etl/variance.h
+++ b/include/etl/variance.h
@@ -164,8 +164,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      add(TIterator first, TIterator last)
+    void add(TIterator first, TIterator last)
     {
       while (first != last)
       {
@@ -187,8 +186,7 @@ namespace etl
     /// Add a range.
     //*********************************
     template <typename TIterator>
-    typename etl::enable_if<!etl::is_same<TIterator, TInput>::value, void>::type
-      operator ()(TIterator first, TIterator last)
+    void operator ()(TIterator first, TIterator last)
     {
       add(first, last);
     }
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index df762696..0cadd285 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -1315,6 +1315,7 @@
     <ClInclude Include="..\..\include\etl\frame_check_sequence.h" />
     <ClInclude Include="..\..\include\etl\fsm.h" />
     <ClInclude Include="..\..\include\etl\callback_service.h" />
+    <ClInclude Include="..\..\include\etl\gamma.h" />
     <ClInclude Include="..\..\include\etl\generators\fsm_generator.h" />
     <ClInclude Include="..\..\include\etl\generators\largest_generator.h" />
     <ClInclude Include="..\..\include\etl\generators\message_packet_generator.h" />
@@ -1369,6 +1370,7 @@
     <ClInclude Include="..\..\include\etl\reference_counted_message_pool.h" />
     <ClInclude Include="..\..\include\etl\reference_counted_object.h" />
     <ClInclude Include="..\..\include\etl\message_router_registry.h" />
+    <ClInclude Include="..\..\include\etl\rms.h" />
     <ClInclude Include="..\..\include\etl\scaled_rounding.h" />
     <ClInclude Include="..\..\include\etl\shared_message.h" />
     <ClInclude Include="..\..\include\etl\span.h" />
@@ -1430,6 +1432,7 @@
     <ClInclude Include="..\..\include\etl\u16string_stream.h" />
     <ClInclude Include="..\..\include\etl\u32format_spec.h" />
     <ClInclude Include="..\..\include\etl\u32string_stream.h" />
+    <ClInclude Include="..\..\include\etl\variance.h" />
     <ClInclude Include="..\..\include\etl\variant_pool.h" />
     <ClInclude Include="..\..\include\etl\version.h" />
     <ClInclude Include="..\..\include\etl\algorithm.h" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index b5670b45..4dbdffec 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -106,9 +106,6 @@
     <Filter Include="Source Files\Scripts">
       <UniqueIdentifier>{562466b5-677d-4448-9e9e-f70805cd71ad}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ETL\Functors">
-      <UniqueIdentifier>{e2ef7213-8d01-4490-8735-2001456cbd88}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -1062,17 +1059,26 @@
     <ClInclude Include="..\..\include\etl\crc.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\histogram.h">
-      <Filter>ETL\Functors</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\correlation.h">
-      <Filter>ETL\Functors</Filter>
+      <Filter>ETL\Maths</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\etl\covariance.h">
-      <Filter>ETL\Functors</Filter>
+      <Filter>ETL\Maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\histogram.h">
+      <Filter>ETL\Maths</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\etl\standard_deviation.h">
-      <Filter>ETL\Functors</Filter>
+      <Filter>ETL\Maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\variance.h">
+      <Filter>ETL\Maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\gamma.h">
+      <Filter>ETL\Maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\rms.h">
+      <Filter>ETL\Maths</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>