[patch] bact-0.13-gcc6.patch

bact-0.13-gcc6.patch (text/plain), 1.65 KB, created by Peter Levine on 2016-09-25 06:03:34 UTC

--- bact-0.13/bact_classify.cpp.old	2016-09-25 01:56:36.255820430 -0400
+++ bact-0.13/bact_classify.cpp	2016-09-25 01:59:06.920095945 -0400
@@ -86,7 +86,7 @@
 	if (id == -2) continue;
 	if (id != -1) {
 	  if (userule) 
-	    rules.insert (std::make_pair <std::string, double> (item, alpha[id]));
+	    rules.insert (std::make_pair(item, alpha[id]));
 	  result.push_back (id);
 	}
 	project (item, size+1, newdepth, l, new_trie_pos, new_str_pos);
@@ -138,7 +138,7 @@
        if (id == -2) continue;
        if (id >= 0) {
 	 if (userule) 
-	   rules.insert (std::make_pair <std::string, double> (tree[i].val.key(), alpha[id]));
+	   rules.insert (std::make_pair(tree[i].val.key(), alpha[id]));
 	 result.push_back (id);
        }
        project (tree[i].val.key(), 1, 0, i, 0, 0);
@@ -158,7 +158,7 @@
 
     for (std::map <std::string, double>::iterator it = rules.begin();
 	 it != rules.end(); ++it) 
-      tmp.push_back (std::make_pair <std::string, double> (it->first,  it->second));
+      tmp.push_back (std::make_pair(it->first,  it->second));
       
     std::sort (tmp.begin(), tmp.end(), pair_2nd_cmp<std::string, double>());
 
--- bact-0.13/bact_mkmodel.cpp.old	2016-09-25 01:56:59.091651610 -0400
+++ bact-0.13/bact_mkmodel.cpp	2016-09-25 01:59:32.780635399 -0400
@@ -111,7 +111,7 @@
    
   for (std::map<std::string, double>::iterator it = rules.begin(); it != rules.end(); ++it) {
     double a = it->second / alpha_sum;
-    ary2.push_back (std::make_pair <const char*, double>(it->first.c_str(), a));
+    ary2.push_back (std::make_pair(it->first.c_str(), a));
     ary.push_back  ((Darts::DoubleArray::key_type *)it->first.c_str());
     alpha.push_back (a);
   }