From 82a38a7e3cc948cd9666bd60e71b3bb9c6b7b1de Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 23 Apr 2009 12:06:26 +0000
Subject: [PATCH] 2009-04-23  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Rewritten RequestGroupMan::calculateStat()
	* src/RequestGroupMan.cc
---
 ChangeLog              | 5 +++++
 src/RequestGroupMan.cc | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7dacac6..c3fc5fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Rewritten RequestGroupMan::calculateStat()
+	* src/RequestGroupMan.cc
+	
 2009-04-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed unnecessary virtual destructor for Request class.
diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc
index c5a952a9..01539e48 100644
--- a/src/RequestGroupMan.cc
+++ b/src/RequestGroupMan.cc
@@ -566,8 +566,12 @@ void RequestGroupMan::forceHalt()
 
 TransferStat RequestGroupMan::calculateStat()
 {
-  return std::accumulate(_requestGroups.begin(), _requestGroups.end(), TransferStat(),
-			 adopt2nd(std::plus<TransferStat>(), mem_fun_sh(&RequestGroup::calculateStat)));
+  TransferStat s;
+  for(std::deque<SharedHandle<RequestGroup> >::const_iterator i =
+	_requestGroups.begin(); i != _requestGroups.end(); ++i) {
+    s += (*i)->calculateStat();
+  }
+  return s;
 }
 
 const std::deque<SharedHandle<DownloadResult> >&