Index: modules/Calorimeter.h
===================================================================
--- modules/Calorimeter.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/Calorimeter.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -50,6 +50,6 @@
 
 private:
-  typedef std::map<Long64_t, std::pair<Double_t, Double_t>> TFractionMap; //!
-  typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
+  typedef std::map<Long64_t, std::pair<Double_t, Double_t> > TFractionMap; //!
+  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
 
   Candidate *fTower;
Index: modules/DenseTrackFilter.h
===================================================================
--- modules/DenseTrackFilter.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/DenseTrackFilter.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -49,5 +49,5 @@
 
 private:
-  typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
+  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
 
   Candidate *fBestTrack;
Index: modules/IdentificationMap.h
===================================================================
--- modules/IdentificationMap.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/IdentificationMap.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -46,5 +46,5 @@
 
 private:
-  typedef std::multimap<Int_t, std::pair<Int_t, DelphesFormula *>> TMisIDMap; //!
+  typedef std::multimap<Int_t, std::pair<Int_t, DelphesFormula *> > TMisIDMap; //!
 
   TMisIDMap fEfficiencyMap; //!
Index: modules/OldCalorimeter.h
===================================================================
--- modules/OldCalorimeter.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/OldCalorimeter.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -36,6 +36,6 @@
 
 private:
-  typedef std::map<Long64_t, std::pair<Double_t, Double_t>> TFractionMap; //!
-  typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
+  typedef std::map<Long64_t, std::pair<Double_t, Double_t> > TFractionMap; //!
+  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
 
   Candidate *fTower;
Index: modules/SimpleCalorimeter.h
===================================================================
--- modules/SimpleCalorimeter.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/SimpleCalorimeter.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -52,5 +52,5 @@
 private:
   typedef std::map<Long64_t, Double_t> TFractionMap; //!
-  typedef std::map<Double_t, std::set<Double_t>> TBinMap; //!
+  typedef std::map<Double_t, std::set<Double_t> > TBinMap; //!
 
   Candidate *fTower;
Index: modules/TreeWriter.h
===================================================================
--- modules/TreeWriter.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/TreeWriter.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -70,5 +70,5 @@
   typedef void (TreeWriter::*TProcessMethod)(ExRootTreeBranch *, TObjArray *); //!
 
-  typedef std::map<ExRootTreeBranch *, std::pair<TProcessMethod, TObjArray *>> TBranchMap; //!
+  typedef std::map<ExRootTreeBranch *, std::pair<TProcessMethod, TObjArray *> > TBranchMap; //!
 
   TBranchMap fBranchMap; //!
Index: modules/UniqueObjectFinder.cc
===================================================================
--- modules/UniqueObjectFinder.cc	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/UniqueObjectFinder.cc	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -92,5 +92,5 @@
 void UniqueObjectFinder::Finish()
 {
-  vector<pair<TIterator *, TObjArray *>>::iterator itInputMap;
+  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
   TIterator *iterator;
 
@@ -108,5 +108,5 @@
 {
   Candidate *candidate;
-  vector<pair<TIterator *, TObjArray *>>::iterator itInputMap;
+  vector<pair<TIterator *, TObjArray *> >::iterator itInputMap;
   TIterator *iterator;
   TObjArray *array;
@@ -132,8 +132,8 @@
 //------------------------------------------------------------------------------
 
-Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector<pair<TIterator *, TObjArray *>>::iterator itInputMap)
+Bool_t UniqueObjectFinder::Unique(Candidate *candidate, vector<pair<TIterator *, TObjArray *> >::iterator itInputMap)
 {
   Candidate *previousCandidate;
-  vector<pair<TIterator *, TObjArray *>>::iterator previousItInputMap;
+  vector<pair<TIterator *, TObjArray *> >::iterator previousItInputMap;
   TObjArray *array;
 
Index: modules/UniqueObjectFinder.h
===================================================================
--- modules/UniqueObjectFinder.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/UniqueObjectFinder.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -50,7 +50,7 @@
   Bool_t fUseUniqueID;
 
-  Bool_t Unique(Candidate *candidate, std::vector<std::pair<TIterator *, TObjArray *>>::iterator itInputMap);
+  Bool_t Unique(Candidate *candidate, std::vector<std::pair<TIterator *, TObjArray *> >::iterator itInputMap);
 
-  std::vector<std::pair<TIterator *, TObjArray *>> fInputMap; //!
+  std::vector<std::pair<TIterator *, TObjArray *> > fInputMap; //!
 
   ClassDef(UniqueObjectFinder, 1)
Index: modules/VertexFinder.cc
===================================================================
--- modules/VertexFinder.cc	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/VertexFinder.cc	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -115,5 +115,5 @@
   // fewer than MinNDF tracks, release the tracks for other clusters to claim.
   sort(clusterSumPT2.begin(), clusterSumPT2.end(), secondDescending);
-  for(vector<pair<UInt_t, Double_t>>::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
+  for(vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
   {
     // Skip the cluster if it no longer has any tracks
@@ -130,5 +130,5 @@
     if((Int_t)clusterIDToInt.at(cluster->first).at("ndf") < fMinNDF)
     {
-      for(map<UInt_t, map<string, Int_t>>::iterator track = trackIDToInt.begin(); track != trackIDToInt.end(); track++)
+      for(map<UInt_t, map<string, Int_t> >::iterator track = trackIDToInt.begin(); track != trackIDToInt.end(); track++)
       {
         if(track->second.at("clusterIndex") != (Int_t)cluster->first)
@@ -155,5 +155,5 @@
   // descending sum(pt**2).
   clusterSumPT2.clear();
-  for(map<UInt_t, map<string, Int_t>>::const_iterator cluster = clusterIDToInt.begin(); cluster != clusterIDToInt.end(); cluster++)
+  for(map<UInt_t, map<string, Int_t> >::const_iterator cluster = clusterIDToInt.begin(); cluster != clusterIDToInt.end(); cluster++)
   {
 
@@ -164,5 +164,5 @@
   sort(clusterSumPT2.begin(), clusterSumPT2.end(), secondDescending);
 
-  for(vector<pair<UInt_t, Double_t>>::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
+  for(vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin(); cluster != clusterSumPT2.end(); cluster++)
   {
     DelphesFactory *factory = GetFactory();
@@ -213,5 +213,5 @@
   // trackPT vector.
   sort(trackPT.begin(), trackPT.end(), secondDescending);
-  for(vector<pair<UInt_t, Double_t>>::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, maxSeeds++)
+  for(vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, maxSeeds++)
   {
     if(track->second < fSeedMinPT)
@@ -228,5 +228,5 @@
 
   // Create the seeds from the SeedMinPT highest pt tracks.
-  for(vector<pair<UInt_t, Double_t>>::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, clusterIndex++)
+  for(vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin(); track != trackPT.end(); track++, clusterIndex++)
   {
     addTrackToCluster(track->first, clusterIndex);
@@ -261,5 +261,5 @@
     {
 
-      for(map<UInt_t, map<string, Double_t>>::const_iterator track = trackIDToDouble.begin(); track != trackIDToDouble.end(); track++)
+      for(map<UInt_t, map<string, Double_t> >::const_iterator track = trackIDToDouble.begin(); track != trackIDToDouble.end(); track++)
       {
         if(trackIDToBool.at(track->first).at("claimed") || trackIDToInt.at(track->first).at("clusterIndex") == (Int_t)clusterIndex)
Index: modules/VertexFinder.h
===================================================================
--- modules/VertexFinder.h	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/VertexFinder.h	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -49,13 +49,13 @@
   TObjArray *fVertexOutputArray;
 
-  std::map<UInt_t, std::map<std::string, Double_t>> trackIDToDouble;
-  std::map<UInt_t, std::map<std::string, Int_t>> trackIDToInt;
-  std::map<UInt_t, std::map<std::string, Bool_t>> trackIDToBool;
+  std::map<UInt_t, std::map<std::string, Double_t> > trackIDToDouble;
+  std::map<UInt_t, std::map<std::string, Int_t> > trackIDToInt;
+  std::map<UInt_t, std::map<std::string, Bool_t> > trackIDToBool;
 
-  std::map<UInt_t, std::map<std::string, Double_t>> clusterIDToDouble;
-  std::map<UInt_t, std::map<std::string, Int_t>> clusterIDToInt;
-  std::map<UInt_t, std::map<std::string, Bool_t>> clusterIDToBool;
-  std::vector<std::pair<UInt_t, Double_t>> trackPT;
-  std::vector<std::pair<UInt_t, Double_t>> clusterSumPT2;
+  std::map<UInt_t, std::map<std::string, Double_t> > clusterIDToDouble;
+  std::map<UInt_t, std::map<std::string, Int_t> > clusterIDToInt;
+  std::map<UInt_t, std::map<std::string, Bool_t> > clusterIDToBool;
+  std::vector<std::pair<UInt_t, Double_t> > trackPT;
+  std::vector<std::pair<UInt_t, Double_t> > clusterSumPT2;
 
   ClassDef(VertexFinder, 1)
Index: modules/VertexFinderDA4D.cc
===================================================================
--- modules/VertexFinderDA4D.cc	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/VertexFinderDA4D.cc	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -1077,5 +1077,5 @@
   // avoid left-right biases by splitting highest Tc first
 
-  std::vector<std::pair<double, unsigned int>> critical;
+  std::vector<std::pair<double, unsigned int> > critical;
   for(unsigned int ik = 0; ik < y.size(); ik++)
   {
@@ -1085,5 +1085,5 @@
     }
   }
-  std::stable_sort(critical.begin(), critical.end(), std::greater<std::pair<double, unsigned int>>());
+  std::stable_sort(critical.begin(), critical.end(), std::greater<std::pair<double, unsigned int> >());
 
   for(unsigned int ic = 0; ic < critical.size(); ic++)
Index: modules/VertexSorter.cc
===================================================================
--- modules/VertexSorter.cc	(revision 341014c3f3bd3259d845de52bde54ba6c3b4ed08)
+++ modules/VertexSorter.cc	(revision 77e9ae1ec605f7c5f74c0c0d56c265999f4acfb0)
@@ -118,6 +118,6 @@
   map<Int_t, Double_t> clusterIDToSumPT2;
   map<Int_t, Double_t>::const_iterator itClusterIDToSumPT2;
-  vector<pair<Int_t, Double_t>> sortedClusterIDs;
-  vector<pair<Int_t, Double_t>>::const_iterator itSortedClusterIDs;
+  vector<pair<Int_t, Double_t> > sortedClusterIDs;
+  vector<pair<Int_t, Double_t> >::const_iterator itSortedClusterIDs;
 
   for(Int_t iCluster = 0; iCluster < fInputArray->GetEntries(); iCluster++)
