From 01f084cbb151689a80f01f91c4b644d7cf1ebbe5 Mon Sep 17 00:00:00 2001
From: conrad <conrad@localhost.localdomain>
Date: Tue, 28 Sep 2021 16:46:45 +1000
Subject: [PATCH] avoid creating the proxy in openmp path

---
 include/armadillo_bits/op_trimat_meat.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/armadillo_bits/op_trimat_meat.hpp b/include/armadillo_bits/op_trimat_meat.hpp
index 2a9e160e..79225153 100644
--- a/include/armadillo_bits/op_trimat_meat.hpp
+++ b/include/armadillo_bits/op_trimat_meat.hpp
@@ -68,7 +68,7 @@ op_trimat::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_trimat>& in)
   const bool upper = (in.aux_uword_a == 0);
   
   // allow detection of in-place operation
-  if(is_Mat<T1>::value)
+  if(is_Mat<T1>::value || (arma_config::openmp && Proxy<T1>::use_mp))
     {
     const unwrap<T1> U(in.m);
     
@@ -80,7 +80,7 @@ op_trimat::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_trimat>& in)
     
     const bool is_alias = P.is_alias(out);
     
-    if(is_Mat<typename Proxy<T1>::stored_type>::value || (arma_config::openmp && Proxy<T1>::use_mp))
+    if(is_Mat<typename Proxy<T1>::stored_type>::value)
       {
       const quasi_unwrap<typename Proxy<T1>::stored_type> U(P.Q);