From 9394ff58ecab30fe2ebaf145aa050a6ca7b1b2f1 Mon Sep 17 00:00:00 2001
From: conrad <conrad@localhost.localdomain>
Date: Mon, 10 May 2021 22:59:20 +1000
Subject: [PATCH] allow use of openmp while transposing compound expressions

---
 include/armadillo_bits/op_htrans_meat.hpp | 2 +-
 include/armadillo_bits/op_strans_meat.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/armadillo_bits/op_htrans_meat.hpp b/include/armadillo_bits/op_htrans_meat.hpp
index e3a4c31d..4eb7087d 100644
--- a/include/armadillo_bits/op_htrans_meat.hpp
+++ b/include/armadillo_bits/op_htrans_meat.hpp
@@ -354,7 +354,7 @@ op_htrans::apply_direct(Mat<typename T1::elem_type>& out, const T1& X)
   arma_extra_debug_sigprint();
   
   // allow detection of in-place transpose
-  if(is_Mat<T1>::value || is_Mat<typename Proxy<T1>::stored_type>::value)
+  if(is_Mat<T1>::value || is_Mat<typename Proxy<T1>::stored_type>::value || (arma_config::openmp && Proxy<T1>::use_mp))
     {
     const unwrap<T1> U(X);
     
diff --git a/include/armadillo_bits/op_strans_meat.hpp b/include/armadillo_bits/op_strans_meat.hpp
index 5f69c7c9..45c2c01f 100644
--- a/include/armadillo_bits/op_strans_meat.hpp
+++ b/include/armadillo_bits/op_strans_meat.hpp
@@ -447,7 +447,7 @@ op_strans::apply_direct(Mat<typename T1::elem_type>& out, const T1& X)
   arma_extra_debug_sigprint();
   
   // allow detection of in-place transpose
-  if(is_Mat<T1>::value || is_Mat<typename Proxy<T1>::stored_type>::value)
+  if(is_Mat<T1>::value || is_Mat<typename Proxy<T1>::stored_type>::value || (arma_config::openmp && Proxy<T1>::use_mp))
     {
     const unwrap<T1> U(X);