2010-11-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	To match the behavior of friend operator functions in
	SharedHandle.h to std::tr1::shared_ptr, we intentionally broke
	these functions and modified code so that our code does not depend
	on old behavior.
	* src/AbstractCommand.cc
	* src/DHTAbstractNodeLookupTask.h
	* src/DHTBucket.cc
	* src/DHTMessageReceiver.cc
	* src/DHTNodeLookupEntry.cc
	* src/DHTRoutingTable.cc
	* src/DefaultBtRequestFactory.cc
	* src/DefaultPeerStorage.cc
	* src/DefaultPieceStorage.cc
	* src/DownloadContext.cc
	* src/EpollEventPoll.cc
	* src/Event.h
	* src/HttpConnection.cc
	* src/KqueueEventPoll.cc
	* src/MultiDiskAdaptor.cc
	* src/PeerAbstractCommand.cc
	* src/PieceStatMan.cc
	* src/PollEventPoll.cc
	* src/PortEventPoll.cc
	* src/SegmentMan.cc
	* src/SelectEventPoll.cc
	* src/SelectEventPoll.h
	* src/ServerStatMan.cc
	* src/SharedHandle.h
	* src/UnknownLengthPieceStorage.cc
	* src/a2functional.h
	* src/option_processing.cc
	* src/version_usage.cc
	* test/BNodeTest.cc
	* test/DHTAnnouncePeerMessageTest.cc
	* test/DHTBucketTest.cc
	* test/DHTFindNodeMessageTest.cc
	* test/DHTGetPeersMessageTest.cc
	* test/DHTIDCloserTest.cc
	* test/DHTMessageFactoryImplTest.cc
	* test/DHTPingMessageTest.cc
	* test/DefaultBtRequestFactoryTest.cc
	* test/DefaultPeerStorageTest.cc
	* test/SequentialPickerTest.cc
	* test/SingletonHolderTest.cc

1 files changed, 9 insertions, 8 deletions

diff --git a/src/version_usage.cc b/src/version_usage.cc
index 5d018b69..6662e290 100644
--- a/src/version_usage.cc
+++ b/src/version_usage.cc
@@ -101,10 +101,10 @@ void showUsage(const std::string& keyword, const OptionParser& oparser) {
     }
     std::cout << "\n"
               << _("Options:") << "\n";
-
-    std::copy(handlers.begin(), handlers.end(),
-              std::ostream_iterator<SharedHandle<OptionHandler> >
-              (std::cout, "\n\n"));
+    for(std::vector<SharedHandle<OptionHandler> >::const_iterator i =
+          handlers.begin(), eoi = handlers.end(); i != eoi; ++i) {
+      std::cout << *(*i) << "\n\n";
+    }
   } else {    
     std::vector<SharedHandle<OptionHandler> > handlers =
       oparser.findByNameSubstring(keyword);
@@ -113,13 +113,14 @@ void showUsage(const std::string& keyword, const OptionParser& oparser) {
                                   " '%s'."), keyword.c_str())
                 << "\n"
                 << _("Options:") << "\n";
-      std::copy(handlers.begin(), handlers.end(),
-                std::ostream_iterator<SharedHandle<OptionHandler> >
-                (std::cout, "\n\n"));
+      for(std::vector<SharedHandle<OptionHandler> >::const_iterator i =
+            handlers.begin(), eoi = handlers.end(); i != eoi; ++i) {
+        std::cout << *(*i) << "\n\n";
+      }
     } else {
       std::cout << StringFormat(_("No option matching with '%s'."),
                                 keyword.c_str())
-                << "\n" << oparser.findByName("help") << "\n";
+                << "\n" << *oparser.findByName("help") << "\n";
     }
   }