From 3032f2594232ff480799e1560854dbfeea49fa97 Mon Sep 17 00:00:00 2001
From: conrad <conrad@localhost.localdomain>
Date: Fri, 16 Sep 2022 14:30:23 +1000
Subject: [PATCH] simplifications

---
 include/armadillo_bits/fn_powext.hpp         | 22 ++++++++++----------
 include/armadillo_bits/glue_powext_bones.hpp |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/armadillo_bits/fn_powext.hpp b/include/armadillo_bits/fn_powext.hpp
index dd169ef5..899c5a91 100644
--- a/include/armadillo_bits/fn_powext.hpp
+++ b/include/armadillo_bits/fn_powext.hpp
@@ -27,18 +27,18 @@ arma_inline
 typename
 enable_if2
   <
-  ( is_arma_type<T1>::value && is_arma_type<T2>::value && is_same_type<typename T1::elem_type, typename T2::elem_type>::yes ),
+  is_arma_type<T1>::value,
   const Glue<T1, T2, glue_powext>
   >::result
 pow
   (
-  const T1& X,
-  const T2& Y
+  const T1&                               X,
+  const Base<typename T1::elem_type, T2>& Y
   )
   {
   arma_extra_debug_sigprint();
   
-  return Glue<T1, T2, glue_powext>(X, Y);
+  return Glue<T1, T2, glue_powext>(X, Y.get_ref());
   }
 
 
@@ -49,18 +49,18 @@ arma_inline
 typename
 enable_if2
   <
-  ( is_arma_type<T1>::value && is_arma_type<T2>::value && is_cx<typename T1::elem_type>::yes && is_same_type<typename T1::pod_type, typename T2::elem_type>::yes ),
+  ( is_arma_type<T1>::value && is_cx<typename T1::elem_type>::yes ),
   const mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>
   >::result
 pow
   (
-  const T1& X,
-  const T2& Y
+  const T1&                              X,
+  const Base<typename T1::pod_type, T2>& Y
   )
   {
   arma_extra_debug_sigprint();
   
-  return mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>(X, Y);
+  return mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>(X, Y.get_ref());
   }
 
 
@@ -88,13 +88,13 @@ inline
 typename
 enable_if2
   <
-  ( is_cx<typename parent::elem_type>::yes && is_same_type<typename parent::pod_type, typename T2::elem_type>::yes ),
+  is_cx<typename parent::elem_type>::yes,
   Mat<typename parent::elem_type>
   >::result
 pow
   (
-  const subview_each1<parent,mode>&      X,
-  const Base<typename T2::elem_type,T2>& Y
+  const subview_each1<parent,mode>&         X,
+  const Base<typename parent::pod_type,T2>& Y
   )
   {
   arma_extra_debug_sigprint();
diff --git a/include/armadillo_bits/glue_powext_bones.hpp b/include/armadillo_bits/glue_powext_bones.hpp
index c0035391..10f6f9af 100644
--- a/include/armadillo_bits/glue_powext_bones.hpp
+++ b/include/armadillo_bits/glue_powext_bones.hpp
@@ -33,7 +33,6 @@ class glue_powext
   template<typename eT> inline static void apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B);
   
   template<typename parent, unsigned int mode, typename T2> inline static Mat<typename parent::elem_type> apply(const subview_each1<parent,mode>& X, const Base<typename parent::elem_type,T2>& Y);
-
   };