From 16a8e3d0d432bb71183c05c09cde3de86a7eff83 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Mon, 16 Jan 2017 06:32:05 +0000
Subject: [PATCH 1/4] gitignore update for ST3

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index da7de5e4..5838caf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 ################
 *~
 *#
+*.sublime-*
 
 # Precompiled Headers #
 #######################

From 91a35340543217dbb7ed6a0a3ab049cbd575976f Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Mon, 16 Jan 2017 06:32:25 +0000
Subject: [PATCH 2/4] Lattice slice utilities now thread safe

---
 lib/lattice/Lattice_transfer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lattice/Lattice_transfer.h b/lib/lattice/Lattice_transfer.h
index cc4617de..a49b1b5f 100644
--- a/lib/lattice/Lattice_transfer.h
+++ b/lib/lattice/Lattice_transfer.h
@@ -386,7 +386,7 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
   }
 
   // the above should guarantee that the operations are local
-  //PARALLEL_FOR_LOOP
+  PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);
@@ -428,7 +428,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
     }
   }
   // the above should guarantee that the operations are local
-  //PARALLEL_FOR_LOOP
+  PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);

From 7cf833dfe911eb81246b060fb4d3abdc7e91f78e Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Tue, 17 Jan 2017 11:00:54 +0000
Subject: [PATCH 3/4] Fixed compilation error in tests hadrons (capital letter
 in dir name)

---
 tests/hadrons/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/hadrons/Makefile.am b/tests/hadrons/Makefile.am
index fae0d212..c8ec1612 100644
--- a/tests/hadrons/Makefile.am
+++ b/tests/hadrons/Makefile.am
@@ -1,3 +1,3 @@
-AM_LDFLAGS += -L../../extras/hadrons
+AM_LDFLAGS += -L../../extras/Hadrons
 
 include Make.inc

From 24d3d31b01416b5b6e7cc98bcf341023f696982c Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 19 Jan 2017 14:08:22 -0800
Subject: [PATCH 4/4] Genetic scheduler: uses insert instead of emplace for
 better compiler compatibility

---
 extras/Hadrons/GeneticScheduler.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/Hadrons/GeneticScheduler.hpp b/extras/Hadrons/GeneticScheduler.hpp
index c9256d96..d0c52596 100644
--- a/extras/Hadrons/GeneticScheduler.hpp
+++ b/extras/Hadrons/GeneticScheduler.hpp
@@ -166,7 +166,7 @@ void GeneticScheduler<T>::initPopulation(void)
     {
         auto p = graph_.topoSort(gen_);
         
-        population_.emplace(func_(p), p);
+        population_.insert(std::make_pair(func_(p), p));
     }
 }
 
@@ -180,8 +180,8 @@ void GeneticScheduler<T>::doCrossover(void)
     crossover(c1, c2, p1, p2);
     PARALLEL_CRITICAL
     {
-        population_.emplace(func_(c1), c1);
-        population_.emplace(func_(c2), c2);
+        population_.insert(std::make_pair(func_(c1), c1));
+        population_.insert(std::make_pair(func_(c2), c2));
     }
 }
 
@@ -200,7 +200,7 @@ void GeneticScheduler<T>::doMutation(void)
         mutation(m, it->second);
         PARALLEL_CRITICAL
         {
-            population_.emplace(func_(m), m);
+            population_.insert(std::make_pair(func_(m), m));
         }
     }
 }