patch bump

include/armadillo_bits/SpBase_bones.hpp

@@ -52,8 +52,6 @@ struct SpBase
   {
   arma_inline const derived& get_ref() const;
   
-  arma_inline bool is_alias(const SpMat<elem_type>& X) const;
-  
   arma_warn_unused inline const SpOp<derived,spop_htrans>  t() const;  //!< Hermitian transpose
   arma_warn_unused inline const SpOp<derived,spop_htrans> ht() const;  //!< Hermitian transpose
   arma_warn_unused inline const SpOp<derived,spop_strans> st() const;  //!< simple transpose

include/armadillo_bits/SpBase_meat.hpp

@@ -31,16 +31,6 @@ SpBase<elem_type,derived>::get_ref() const
 
 
 
-template<typename elem_type, typename derived>
-arma_inline
-bool
-SpBase<elem_type,derived>::is_alias(const SpMat<elem_type>& X) const
-  {
-  return (*this).get_ref().is_alias(X);
-  }
-
-
-
 template<typename elem_type, typename derived>
 inline
 const SpOp<derived, spop_htrans>

include/armadillo_bits/SpGlue_bones.hpp

@@ -35,7 +35,8 @@ struct SpGlue : public SpBase< typename T1::elem_type, SpGlue<T1, T2, spglue_typ
   inline  SpGlue(const T1& in_A, const T2& in_B, const elem_type in_aux);
   inline ~SpGlue();
   
-  arma_inline bool is_alias(const SpMat<elem_type>& X) const;
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
   
   const T1&       A;    //!< first operand;  must be derived from SpBase
   const T2&       B;    //!< second operand; must be derived from SpBase

include/armadillo_bits/SpGlue_meat.hpp

@@ -54,9 +54,10 @@ SpGlue<T1,T2,spglue_type>::~SpGlue()
 
 
 template<typename T1, typename T2, typename spglue_type>
+template<typename eT2>
 arma_inline
 bool
-SpGlue<T1,T2,spglue_type>::is_alias(const SpMat<typename T1::elem_type>& X) const
+SpGlue<T1,T2,spglue_type>::is_alias(const SpMat<eT2>& X) const
   {
   return (A.is_alias(X) || B.is_alias(X));
   }

include/armadillo_bits/SpMat_bones.hpp

@@ -647,7 +647,8 @@ class SpMat : public SpBase< eT, SpMat<eT> >
   template<typename eT2, typename T1, typename Functor> inline void init_xform_mt(const SpBase<eT2,T1>& x, const Functor& func);
   
   //! don't use this unless you're writing internal Armadillo code
-  arma_inline bool is_alias(const SpMat<eT>& X) const;
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
   
   
   protected:

include/armadillo_bits/SpMat_meat.hpp

@@ -6015,11 +6015,14 @@ SpMat<eT>::init_xform_mt(const SpBase<eT2,T1>& A, const Functor& func)
 
 
 template<typename eT>
+template<typename eT2>
 arma_inline
 bool
-SpMat<eT>::is_alias(const SpMat<eT>& X) const
+SpMat<eT>::is_alias(const SpMat<eT2>& X) const
   {
-  return (&X == this);
+  arma_debug_sigprint();
+  
+  return (is_same_type<eT,eT2>::yes) && (void_ptr(this) == void_ptr(&X));
   }
 
 

include/armadillo_bits/SpOp_bones.hpp

@@ -36,7 +36,8 @@ struct SpOp : public SpBase< typename T1::elem_type, SpOp<T1, op_type> >
   inline          SpOp(const T1& in_m, const uword     in_aux_uword_a, const uword in_aux_uword_b);
   inline         ~SpOp();
   
-  arma_inline bool is_alias(const SpMat<elem_type>& X) const;
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
   
   const T1&       m;            //!< the operand; must be derived from SpBase
         elem_type aux;          //!< auxiliary data, using the element type as used by T1

include/armadillo_bits/SpOp_meat.hpp

@@ -64,9 +64,10 @@ SpOp<T1, op_type>::~SpOp()
 
 
 template<typename T1, typename op_type>
+template<typename eT2>
 arma_inline
 bool
-SpOp<T1, op_type>::is_alias(const SpMat<typename T1::elem_type>& X) const
+SpOp<T1, op_type>::is_alias(const SpMat<eT2>& X) const
   {
   return m.is_alias(X);
   }

include/armadillo_bits/SpSubview_bones.hpp

@@ -321,7 +321,8 @@ class SpSubview : public SpBase< eT, SpSubview<eT> >
   inline const_row_iterator end_row(const uword row_num) const;
   
   //! don't use this unless you're writing internal Armadillo code
-  arma_inline bool is_alias(const SpMat<eT>& X) const;
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
   
   
   private:

include/armadillo_bits/SpSubview_col_list_bones.hpp

@@ -87,6 +87,8 @@ class SpSubview_col_list : public SpBase< eT, SpSubview_col_list<eT,T1> >
   inline static void schur_inplace(SpMat<eT>& out, const SpSubview_col_list& in);
   inline static void   div_inplace(SpMat<eT>& out, const SpSubview_col_list& in);
   
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
   
   friend class SpMat<eT>;
   };

include/armadillo_bits/SpSubview_col_list_meat.hpp

@@ -714,4 +714,15 @@ SpSubview_col_list<eT,T1>::div_inplace(SpMat<eT>& out, const SpSubview_col_list&
 
 
 
+template<typename eT, typename T1>
+template<typename eT2>
+arma_inline
+bool
+SpSubview_col_list<eT,T1>::is_alias(const SpMat<eT2>& X) const
+  {
+  return m.is_alias(X);
+  }
+
+
+
 //! @}

include/armadillo_bits/SpSubview_meat.hpp

@@ -1786,9 +1786,10 @@ SpSubview<eT>::end_row(const uword row_num) const
 
 
 template<typename eT>
+template<typename eT2>
 arma_inline
 bool
-SpSubview<eT>::is_alias(const SpMat<eT>& X) const
+SpSubview<eT>::is_alias(const SpMat<eT2>& X) const
   {
   return m.is_alias(X);
   }

include/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 15
 #define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 7
+#define ARMA_VERSION_PATCH 8
 #define ARMA_VERSION_NAME  "Medium Roast Deluxe"
 
 

include/armadillo_bits/mtSpOp_meat.hpp

@@ -94,7 +94,7 @@ arma_inline
 bool
 mtSpOp<out_eT, T1, op_type>::is_alias(const SpMat<eT2>& X) const
   {
-  return (void_ptr(&X) == void_ptr(&m));
+  return m.is_alias(X);
   }
 
 

include/armadillo_bits/mtSpReduceOp_bones.hpp

@@ -50,6 +50,9 @@ struct mtSpReduceOp : public SpBase< out_eT, mtSpReduceOp<out_eT, T1, op_type> >
   inline          mtSpReduceOp(const T1& in_m, const uword in_aux_uword_a, const uword in_aux_uword_b);
   inline         ~mtSpReduceOp();
   
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
+  
   const T1&   m;            //!< the operand; must be derived from SpBase
         uword aux_uword_a;  //!< auxiliary data, uword format
         uword aux_uword_b;  //!< auxiliary data, uword format

include/armadillo_bits/mtSpReduceOp_meat.hpp

@@ -52,4 +52,15 @@ mtSpReduceOp<out_eT, T1, op_type>::~mtSpReduceOp()
 
 
 
+template<typename out_eT, typename T1, typename op_type>
+template<typename eT2>
+arma_inline
+bool
+mtSpReduceOp<out_eT, T1, op_type>::is_alias(const SpMat<eT2>& X) const
+  {
+  return m.is_alias(X);
+  }
+
+
+
 //! @}

include/armadillo_bits/spdiagview_bones.hpp

@@ -105,6 +105,9 @@ class spdiagview : public SpBase< eT, spdiagview<eT> >
   inline static void extract(SpMat<eT>& out, const spdiagview& in);
   inline static void extract(  Mat<eT>& out, const spdiagview& in);
   
+  template<typename eT2>
+  arma_inline bool is_alias(const SpMat<eT2>& X) const;
+  
   
   friend class SpMat<eT>;
   };

include/armadillo_bits/spdiagview_meat.hpp

@@ -1076,4 +1076,15 @@ spdiagview<eT>::randn()
 
 
 
+template<typename eT>
+template<typename eT2>
+arma_inline
+bool
+spdiagview<eT>::is_alias(const SpMat<eT2>& X) const
+  {
+  return m.is_alias(X);
+  }
+
+
+
 //! @}