Modernize std::accumulate call breaking compile

emilydolson · Feb 13, 2024 · cdffaf1 · cdffaf1
1 parent 5c181b7
commit cdffaf1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/avida-core/source/main/cOrgMessagePredicate.h b/avida-core/source/main/cOrgMessagePredicate.h
@@ -87,7 +87,12 @@ struct cOrgMessagePred_CountDemeMessages : public cOrgMessagePredicate {
 
   virtual void Print(int update, std::ostream& out) {
 		out << update << " COUNT " << 
-		std::accumulate(m_msg_counts.begin(), m_msg_counts.end(), 0, apply2nd<MessageCounts::iterator, plus<int> >()) << " ";
+		std::accumulate(
+			std::begin(m_msg_counts),
+			std::end(m_msg_counts),
+			int{},
+			[](auto first, auto second) { return first + second.second; }
+		) << " ";
 		for(MessageCounts::iterator i=m_msg_counts.begin(); i!=m_msg_counts.end(); ++i) {
 			out << " " << i->second;
 		}