From 10a052d695211b4e7ef95dd2fac3206ab8f9e365 Mon Sep 17 00:00:00 2001
From: Michael Marshall <43034299+mmphys@users.noreply.github.com>
Date: Fri, 17 May 2019 09:59:01 +0100
Subject: [PATCH] 3 issues preventing compilation under clang. Marked these
 with FELIX_ISSUE and made minimal change to make compile (as fix not obvious)

---
 Hadrons/Modules/MDistil/BContraction.hpp |  3 ++-
 Hadrons/Modules/MDistil/Baryon2pt.hpp    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Hadrons/Modules/MDistil/BContraction.hpp b/Hadrons/Modules/MDistil/BContraction.hpp
index 21d28e3a..5cfd8967 100644
--- a/Hadrons/Modules/MDistil/BContraction.hpp
+++ b/Hadrons/Modules/MDistil/BContraction.hpp
@@ -261,8 +261,9 @@ void TBContraction<FImpl>::execute(void)
     }
 
     BFieldIO BField_save;
+#ifdef FELIX_ISSUE
     BField_save.BField = BField3;
-
+#endif
   std::string filename ="./" + output + ".h5"; 
   std::cout << "Writing to file " << filename << std::endl;
   Hdf5Writer writer(filename);
diff --git a/Hadrons/Modules/MDistil/Baryon2pt.hpp b/Hadrons/Modules/MDistil/Baryon2pt.hpp
index 02ac892a..3004e331 100644
--- a/Hadrons/Modules/MDistil/Baryon2pt.hpp
+++ b/Hadrons/Modules/MDistil/Baryon2pt.hpp
@@ -186,8 +186,16 @@ void TBaryon2pt<FImpl>::execute(void)
       Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2])  };
       for (int imom=0 ; imom < Nmom ; imom++){
         std::cout << imom << std::endl;
-        Eigen::Tensor<Complex,6> B6L = BFieldL.BField.chip(imom,0);
-        Eigen::Tensor<Complex,6> B6R = BFieldR.BField.chip(imom,0);
+        Eigen::Tensor<Complex,6> B6L
+#ifdef FELIX_ISSUE
+        = BFieldL.BField.chip(imom,0)
+#endif
+        ;
+        Eigen::Tensor<Complex,6> B6R
+#ifdef FELIX_ISSUE
+        = BFieldR.BField.chip(imom,0)
+#endif
+        ;
         for (int ig=0 ; ig < Ngamma ; ig++){
           Eigen::Tensor<Complex,5> B5L = B6L.chip(ig,0);
           Eigen::Tensor<Complex,5> B5R = B6R.chip(ig,0);