From 4643ddfff800d387bd4ae9219fa04f9fedd8d792 Mon Sep 17 00:00:00 2001
From: conrad <conrad@localhost.localdomain>
Date: Tue, 11 Jun 2024 12:26:10 +1000
Subject: [PATCH] rename op_dot::apply_proxy() to op_dot::apply_proxy_linear()

---
 include/armadillo_bits/fn_accu.hpp      | 2 +-
 include/armadillo_bits/fn_as_scalar.hpp | 2 +-
 include/armadillo_bits/op_dot_bones.hpp | 4 ++--
 include/armadillo_bits/op_dot_meat.hpp  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/armadillo_bits/fn_accu.hpp b/include/armadillo_bits/fn_accu.hpp
index 97321e45..e7c07b3e 100644
--- a/include/armadillo_bits/fn_accu.hpp
+++ b/include/armadillo_bits/fn_accu.hpp
@@ -314,7 +314,7 @@ accu(const Glue<T1,T2,glue_times>& expr)
       
       arma_conform_assert_mul_size(PA.get_n_rows(), PA.get_n_cols(), PB.get_n_rows(), PB.get_n_cols(), "matrix multiplication");
       
-      return op_dot::apply_proxy(PA,PB);
+      return op_dot::apply_proxy_linear(PA,PB);
       }
     }
   
diff --git a/include/armadillo_bits/fn_as_scalar.hpp b/include/armadillo_bits/fn_as_scalar.hpp
index e2ae69cf..38cf8bf1 100644
--- a/include/armadillo_bits/fn_as_scalar.hpp
+++ b/include/armadillo_bits/fn_as_scalar.hpp
@@ -117,7 +117,7 @@ as_scalar_redirect<2>::apply(const Glue<T1, T2, glue_times>& X)
       "as_scalar(): incompatible dimensions"
       );
     
-    return op_dot::apply_proxy(PA,PB);
+    return op_dot::apply_proxy_linear(PA,PB);
     }
   }
 
diff --git a/include/armadillo_bits/op_dot_bones.hpp b/include/armadillo_bits/op_dot_bones.hpp
index 23068de8..d4b0674b 100644
--- a/include/armadillo_bits/op_dot_bones.hpp
+++ b/include/armadillo_bits/op_dot_bones.hpp
@@ -57,10 +57,10 @@ class op_dot
   arma_hot inline static typename T1::elem_type apply(const T1& X, const T2& Y);
   
   template<typename T1, typename T2>
-  arma_hot inline static typename  arma_not_cx<typename T1::elem_type>::result apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB);
+  arma_hot inline static typename  arma_not_cx<typename T1::elem_type>::result apply_proxy_linear(const Proxy<T1>& PA, const Proxy<T2>& PB);
   
   template<typename T1, typename T2>
-  arma_hot inline static typename arma_cx_only<typename T1::elem_type>::result apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB);
+  arma_hot inline static typename arma_cx_only<typename T1::elem_type>::result apply_proxy_linear(const Proxy<T1>& PA, const Proxy<T2>& PB);
   };
 
 
diff --git a/include/armadillo_bits/op_dot_meat.hpp b/include/armadillo_bits/op_dot_meat.hpp
index 29da98a5..e4ed53e8 100644
--- a/include/armadillo_bits/op_dot_meat.hpp
+++ b/include/armadillo_bits/op_dot_meat.hpp
@@ -304,7 +304,7 @@ op_dot::apply(const T1& X, const T2& Y)
   
   arma_conform_check( (PA.get_n_elem() != PB.get_n_elem()), "dot(): objects must have the same number of elements" );
   
-  return op_dot::apply_proxy(PA,PB);
+  return op_dot::apply_proxy_linear(PA,PB);
   }
 
 
@@ -312,7 +312,7 @@ op_dot::apply(const T1& X, const T2& Y)
 template<typename T1, typename T2>
 inline
 typename arma_not_cx<typename T1::elem_type>::result
-op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
+op_dot::apply_proxy_linear(const Proxy<T1>& PA, const Proxy<T2>& PB)
   {
   arma_debug_sigprint();
   
@@ -349,7 +349,7 @@ op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
 template<typename T1, typename T2>
 inline
 typename arma_cx_only<typename T1::elem_type>::result
-op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB)
+op_dot::apply_proxy_linear(const Proxy<T1>& PA, const Proxy<T2>& PB)
   {
   arma_debug_sigprint();