2010-10-30 Tatsuhiro Tsujikawa <[email protected]>

	Added '// namespace' after end of unnamed namespace.
	* src/AbstractCommand.cc
	* src/AnnounceList.cc
	* src/BtSeederStateChoke.cc
	* src/ConsoleStatCalc.cc
	* src/CookieStorage.cc
	* src/DHTBucket.cc
	* src/DHTPeerAnnounceEntry.cc
	* src/DHTPeerAnnounceStorage.cc
	* src/DHTTaskQueueImpl.cc
	* src/DefaultBtMessageDispatcher.cc
	* src/DefaultBtRequestFactory.cc
	* src/DefaultPeerStorage.cc
	* src/DefaultPieceStorage.cc
	* src/ExpatMetalinkProcessor.cc
	* src/ExpatXmlRpcRequestProcessor.cc
	* src/FeedbackURISelector.cc
	* src/FileEntry.cc
	* src/GZipEncoder.cc
	* src/Metalink2RequestGroup.cc
	* src/MetalinkEntry.cc
	* src/MetalinkParserStateV3Impl.cc
	* src/MetalinkParserStateV4Impl.cc
	* src/Metalinker.cc
	* src/MultiDiskAdaptor.cc
	* src/Netrc.cc
	* src/NsCookieParser.cc
	* src/OptionParser.cc
	* src/PieceStatMan.cc
	* src/RarestPieceSelector.cc
	* src/RequestGroupMan.cc
	* src/SegmentMan.cc
	* src/ServerStatMan.cc
	* src/SocketCore.cc
	* src/XML2SAXMetalinkProcessor.cc
	* src/Xml2XmlRpcRequestProcessor.cc
	* src/XmlRpcMethodImpl.cc
	* src/cookie_helper.cc
	* src/download_helper.cc
	* src/messageDigest.cc
	* src/util.cc

ChangeLog

@@ -1,3 +1,47 @@
+2010-10-30  Tatsuhiro Tsujikawa  <[email protected]>
+
+	Added '// namespace' after end of unnamed namespace.
+	* src/AbstractCommand.cc
+	* src/AnnounceList.cc
+	* src/BtSeederStateChoke.cc
+	* src/ConsoleStatCalc.cc
+	* src/CookieStorage.cc
+	* src/DHTBucket.cc
+	* src/DHTPeerAnnounceEntry.cc
+	* src/DHTPeerAnnounceStorage.cc
+	* src/DHTTaskQueueImpl.cc
+	* src/DefaultBtMessageDispatcher.cc
+	* src/DefaultBtRequestFactory.cc
+	* src/DefaultPeerStorage.cc
+	* src/DefaultPieceStorage.cc
+	* src/ExpatMetalinkProcessor.cc
+	* src/ExpatXmlRpcRequestProcessor.cc
+	* src/FeedbackURISelector.cc
+	* src/FileEntry.cc
+	* src/GZipEncoder.cc
+	* src/Metalink2RequestGroup.cc
+	* src/MetalinkEntry.cc
+	* src/MetalinkParserStateV3Impl.cc
+	* src/MetalinkParserStateV4Impl.cc
+	* src/Metalinker.cc
+	* src/MultiDiskAdaptor.cc
+	* src/Netrc.cc
+	* src/NsCookieParser.cc
+	* src/OptionParser.cc
+	* src/PieceStatMan.cc
+	* src/RarestPieceSelector.cc
+	* src/RequestGroupMan.cc
+	* src/SegmentMan.cc
+	* src/ServerStatMan.cc
+	* src/SocketCore.cc
+	* src/XML2SAXMetalinkProcessor.cc
+	* src/Xml2XmlRpcRequestProcessor.cc
+	* src/XmlRpcMethodImpl.cc
+	* src/cookie_helper.cc
+	* src/download_helper.cc
+	* src/messageDigest.cc
+	* src/util.cc
+
 2010-10-30  Tatsuhiro Tsujikawa  <[email protected]>
 
 	Removed unnecessary unnamed namespace

src/AbstractCommand.cc

@@ -574,7 +574,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 static bool inNoProxy(const SharedHandle<Request>& req,
                       const std::string& noProxy)

src/AnnounceList.cc

@@ -175,7 +175,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class FindCompletedAllowedTier {
@@ -190,7 +190,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 size_t AnnounceList::countStoppedAllowedTier() const {
   return count_if(tiers_.begin(), tiers_.end(), FindStoppedAllowedTier());

src/BtSeederStateChoke.cc

@@ -124,7 +124,7 @@ public:
     peer->chokingRequired(true);
   }
 };
-}
+} // namespace
 
 void
 BtSeederStateChoke::executeChoke

src/ConsoleStatCalc.cc

@@ -174,7 +174,7 @@ public:
               << std::setfill(SEP_CHAR) << std::setw(cols_) << SEP_CHAR << "\n";
   }
 };
-}
+} // namespace
 
 static void printProgressSummary
 (const std::deque<SharedHandle<RequestGroup> >& groups, size_t cols,

src/CookieStorage.cc

@@ -180,7 +180,7 @@ public:
     return cookiePathDivider.cookie_;
   }
 };
-}
+} // namespace
 
 namespace {
 class OrderByPathDepthDesc:public std::binary_function<Cookie, Cookie, bool> {
@@ -209,7 +209,7 @@ public:
        lhs.cookie_.getCreationTime() < rhs.cookie_.getCreationTime());
   }
 };
-}
+} // namespace
 
 namespace {
 template<typename DomainInputIterator, typename CookieOutputIterator>
@@ -228,7 +228,7 @@ void searchCookieByDomainSuffix
     (*i).findCookie(out, requestHost, requestPath, now, secure);
   }
 }
-}
+} // namespace
 
 bool CookieStorage::contains(const Cookie& cookie) const
 {

src/DHTBucket.cc

@@ -266,7 +266,7 @@ public:
     return node->isQuestionable();
   }
 };
-}
+} // namespace
 
 bool DHTBucket::containsQuestionableNode() const
 {

src/DHTPeerAnnounceEntry.cc

@@ -82,7 +82,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void DHTPeerAnnounceEntry::removeStalePeerAddrEntry(time_t timeout)
 {

src/DHTPeerAnnounceStorage.cc

@@ -66,7 +66,7 @@ public:
     return memcmp(lhs->getInfoHash(), rhs->getInfoHash(), DHT_ID_LENGTH) < 0;
   }
 };
-}
+} // namespace
 
 SharedHandle<DHTPeerAnnounceEntry>
 DHTPeerAnnounceStorage::getPeerAnnounceEntry(const unsigned char* infoHash)
@@ -127,7 +127,7 @@ public:
     e->removeStalePeerAddrEntry(DHT_PEER_ANNOUNCE_PURGE_INTERVAL);
   }
 };
-}
+} // namespace
 
 void DHTPeerAnnounceStorage::handleTimeout()
 {

src/DHTTaskQueueImpl.cc

@@ -41,7 +41,7 @@ namespace aria2 {
 
 namespace {
 const size_t NUM_CONCURRENT_TASK = 5;
-}
+} // namespace
 
 DHTTaskQueueImpl::DHTTaskQueueImpl():
   periodicTaskQueue1_(NUM_CONCURRENT_TASK),

src/DefaultBtMessageDispatcher.cc

@@ -164,7 +164,7 @@ public:
     piece_->cancelBlock(slot.getBlockIndex());
   }
 };
-}
+} // namespace
 
 // localhost cancels outstanding download requests to the peer.
 void DefaultBtMessageDispatcher::doAbortOutstandingRequestAction
@@ -220,7 +220,7 @@ public:
   }
 
 };
-}
+} // namespace
 
 namespace {
 class FindChokedRequestSlot {
@@ -235,7 +235,7 @@ public:
     return !peer_->isInPeerAllowedIndexSet(slot.getIndex());
   }
 };
-}
+} // namespace
 
 // localhost received choke message from the peer.
 void DefaultBtMessageDispatcher::doChokedAction()
@@ -310,7 +310,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class FindStaleRequestSlot {
@@ -336,7 +336,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void DefaultBtMessageDispatcher::checkRequestSlotAndDoNecessaryThing()
 {
@@ -374,7 +374,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 bool DefaultBtMessageDispatcher::isOutstandingRequest
 (size_t index, size_t blockIndex) {

src/DefaultBtRequestFactory.cc

@@ -86,7 +86,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void DefaultBtRequestFactory::removeCompletedPiece() {
   std::for_each(pieces_.begin(), pieces_.end(),
@@ -123,7 +123,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class FindChokedPiece {
@@ -137,7 +137,7 @@ public:
     return !peer_->isInPeerAllowedIndexSet(piece->getIndex());
   }
 };
-}
+} // namespace
 
 void DefaultBtRequestFactory::doChokedAction()
 {
@@ -252,7 +252,7 @@ public:
     numMissingBlock_ += piece->countMissingBlock();
   }
 };
-}
+} // namespace
 
 size_t DefaultBtRequestFactory::countMissingBlock()
 {

src/DefaultPeerStorage.cc

@@ -78,7 +78,7 @@ public:
        (peer_->getPort() == peer->getPort()));
   }
 };
-}
+} // namespace
 
 bool DefaultPeerStorage::isPeerAlreadyAdded(const SharedHandle<Peer>& peer)
 {
@@ -151,7 +151,7 @@ public:
     return peer->unused() && peer->isGood();
   }
 };
-}
+} // namespace
 
 SharedHandle<Peer> DefaultPeerStorage::getUnusedPeer() {
   std::deque<SharedHandle<Peer> >::const_iterator itr =
@@ -176,7 +176,7 @@ public:
     return ipaddr == peer->getIPAddress() && port == peer->getPort();
   }
 };
-}
+} // namespace
 
 SharedHandle<Peer> DefaultPeerStorage::getPeer(const std::string& ipaddr,
                                                uint16_t port) const {
@@ -212,7 +212,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void DefaultPeerStorage::getActivePeers
 (std::vector<SharedHandle<Peer> >& activePeers)

src/DefaultPieceStorage.cc

@@ -659,7 +659,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void DefaultPieceStorage::removeAdvertisedPiece(time_t elapsed)
 {

src/ExpatMetalinkProcessor.cc

@@ -58,7 +58,7 @@ public:
 
   SessionData(const SharedHandle<MetalinkParserStateMachine>& stm):stm_(stm) {}
 };
-}
+} // namespace
 
 static void splitNsName
 (std::string& localname, std::string& prefix, std::string& nsUri,

src/ExpatXmlRpcRequestProcessor.cc

@@ -55,7 +55,7 @@ struct SessionData {
 
   SessionData(XmlRpcRequestParserStateMachine* stm):stm_(stm) {}
 };
-}
+} // namespace
 
 static void mlStartElement(void* userData, const char* name, const char** attrs)
 {

src/FeedbackURISelector.cc

@@ -65,7 +65,7 @@ public:
     return lhs.first->getDownloadSpeed() > rhs.first->getDownloadSpeed();
   }
 };
-}
+} // namespace
 
 std::string FeedbackURISelector::select
 (FileEntry* fileEntry,

src/FileEntry.cc

@@ -221,7 +221,7 @@ public:
       lhs->getPeerStat()->getAvgDownloadSpeed() > rhs->getPeerStat()->getAvgDownloadSpeed();
   }
 };
-}
+} // namespace
 
 void FileEntry::storePool(const SharedHandle<Request>& request)
 {
@@ -301,7 +301,7 @@ public:
     return uriResult.getResult() == r_;
   }
 };
-}
+} // namespace
 
 void FileEntry::extractURIResult
 (std::deque<URIResult>& res, downloadresultcode::RESULT r)

src/GZipEncoder.cc

@@ -44,7 +44,7 @@ namespace aria2 {
 
 namespace {
 const int OUTBUF_LENGTH = 4096;
-}
+} // namespace
 
 GZipEncoder::GZipEncoder():strm_(0), finished_(false) {}
 

src/Metalink2RequestGroup.cc

@@ -89,7 +89,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class FindBitTorrentUri {
@@ -104,7 +104,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void
 Metalink2RequestGroup::generate

src/MetalinkEntry.cc

@@ -77,7 +77,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 MetalinkEntry& MetalinkEntry::operator=(const MetalinkEntry& metalinkEntry)
 {
@@ -129,7 +129,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void MetalinkEntry::setProtocolPriority(const std::string& protocol,
                                           int priorityToAdd)
@@ -148,7 +148,7 @@ public:
     return res1->priority < res2->priority;
   }
 };
-}
+} // namespace
 
 void MetalinkEntry::reorderResourcesByPriority() {
   std::random_shuffle(resources.begin(), resources.end(),
@@ -182,7 +182,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 void MetalinkEntry::dropUnsupportedResource() {
   resources.erase(std::remove_if(resources.begin(), resources.end(),

src/MetalinkParserStateV3Impl.cc

@@ -62,7 +62,7 @@ const std::string SIZE("size");
 const std::string TYPE("type");
 const std::string URL("url");
 const std::string VERIFICATION("verification");
-}
+} // namespace
 
 const std::string METALINK3_NAMESPACE_URI("http://www.metalinker.org/");
 
@@ -79,7 +79,7 @@ public:
       (attr.nsUri.empty() || attr.nsUri == METALINK3_NAMESPACE_URI);
   }
 };
-}
+} // namespace
 
 template<typename Container>
 static typename Container::const_iterator findAttr

src/MetalinkParserStateV4Impl.cc

@@ -61,7 +61,7 @@ const std::string SIZE("size");
 const std::string TYPE("type");
 const std::string MEDIATYPE("mediatype");
 const std::string URL("url");
-}
+} // namespace
 
 const std::string METALINK4_NAMESPACE_URI("urn:ietf:params:xml:ns:metalink");
 
@@ -78,7 +78,7 @@ public:
       (attr.nsUri.empty() || attr.nsUri == METALINK4_NAMESPACE_URI);
   }
 };
-}
+} // namespace
 
 template<typename Container>
 static typename Container::const_iterator findAttr

src/Metalinker.cc

@@ -76,7 +76,7 @@ public:
     return true;
   }
 };
-}
+} // namespace
 
 void Metalinker::queryEntry
 (std::vector<SharedHandle<MetalinkEntry> >& queryResult,

src/MultiDiskAdaptor.cc

@@ -361,7 +361,7 @@ public:
     return offset < dwe->getFileEntry()->getOffset();
   }
 };
-}
+} // namespace
 
 static DiskWriterEntries::const_iterator
 findFirstDiskWriterEntry

src/Netrc.cc

@@ -162,7 +162,7 @@ public:
     return authenticator->match(hostname);
   }
 };
-}
+} // namespace
 
 SharedHandle<Authenticator>
 Netrc::findAuthenticator(const std::string& hostname) const

src/NsCookieParser.cc

@@ -52,7 +52,7 @@ NsCookieParser::~NsCookieParser() {}
 
 namespace {
 const std::string C_TRUE("TRUE");
-}
+} // namespace
 
 namespace {
 bool parseNsCookie
@@ -89,7 +89,7 @@ bool parseNsCookie
   cookie.setCreationTime(creationTime);
   return true;
 }
-}
+} // namespace
 
 std::vector<Cookie> NsCookieParser::parse
 (const std::string& filename, time_t creationTime)

src/OptionParser.cc

@@ -191,7 +191,7 @@ public:
     return A2STR::NIL;
   }
 };
-}
+} // namespace
 
 OptionHandlerHandle OptionParser::getOptionHandlerByName
 (const std::string& optName)
@@ -255,7 +255,7 @@ public:
     return !optionHandler->isHidden() && optionHandler->hasTag(tag_);
   }
 };
-}
+} // namespace
 
 std::vector<SharedHandle<OptionHandler> >
 OptionParser::findByTag(const std::string& tag) const
@@ -283,7 +283,7 @@ public:
       optionHandler->getName().find(substring_) != std::string::npos;
   }
 };
-}
+} // namespace
 
 std::vector<SharedHandle<OptionHandler> >
 OptionParser::findByNameSubstring(const std::string& substring) const
@@ -347,7 +347,7 @@ public:
     return !optionHandler->isHidden() && optionHandler->getOptionID() == id_;
   }
 };
-}
+} // namespace
 
 SharedHandle<OptionHandler> OptionParser::findByID(int id) const
 {
@@ -369,7 +369,7 @@ public:
       optionHandler->getShortName() == shortName_;
   }
 };
-}
+} // namespace
 
 SharedHandle<OptionHandler> OptionParser::findByShortName(char shortName) const
 {

src/PieceStatMan.cc

@@ -69,7 +69,7 @@ public:
     return SharedHandle<PieceStat>(new PieceStat(index_++));
   }
 };
-}
+} // namespace
 
 PieceStatMan::PieceStatMan(size_t pieceNum, bool randomShuffle):
   pieceStats_(pieceNum),
@@ -106,7 +106,7 @@ public:
     return pieceStats_[lhs] < pieceStats_[rhs];
   }
 };
-}
+} // namespace
 
 void PieceStatMan::addPieceStats(const unsigned char* bitfield,
                                  size_t bitfieldLength)

src/RarestPieceSelector.cc

@@ -61,7 +61,7 @@ public:
     return misbitfield_[index/8]&mask;
   }
 };
-}
+} // namespace
 
 bool RarestPieceSelector::select
 (size_t& index, const unsigned char* bitfield, size_t nbits) const

src/RequestGroupMan.cc

@@ -367,7 +367,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class CollectServerStat {
@@ -411,7 +411,7 @@ public:
     }    
   }
 };
-}
+} // namespace
 
 namespace {
 class FindStoppedRequestGroup {
@@ -420,7 +420,7 @@ public:
     return group->getNumCommand() == 0;
   }
 };
-}
+} // namespace
 
 void RequestGroupMan::updateServerStat()
 {

src/SegmentMan.cc

@@ -318,7 +318,7 @@ public:
     return segmentEntry->segment->getIndex() == segment_->getIndex();
   }
 };
-}
+} // namespace
 
 bool SegmentMan::completeSegment
 (cuid_t cuid, const SharedHandle<Segment>& segment) {
@@ -384,7 +384,7 @@ public:
       peerStat_->getProtocol() == p->getProtocol();
   }
 };
-}
+} // namespace
 
 void SegmentMan::updateFastestPeerStat(const SharedHandle<PeerStat>& peerStat)
 {
@@ -445,7 +445,7 @@ public:
     return ps->getSessionDownloadLength()+total;
   }
 };
-}
+} // namespace
 
 uint64_t SegmentMan::calculateSessionDownloadLength() const
 {

src/ServerStatMan.cc

@@ -154,7 +154,7 @@ public:
     return ss->getLastUpdated().difference(time_) >= timeout_;
   }
 };
-}
+} // namespace
 
 void ServerStatMan::removeStaleServerStat(time_t timeout)
 {

src/SocketCore.cc

@@ -1315,7 +1315,7 @@ int getDefaultAIFlags()
   return defaultAIFlags;
 }
 
-}
+} // namespace
 
 void setDefaultAIFlags(int flags)
 {

src/XML2SAXMetalinkProcessor.cc

@@ -56,7 +56,7 @@ public:
 
   SessionData(const SharedHandle<MetalinkParserStateMachine>& stm):stm_(stm) {}
 };
-}
+} // namespace
 
 static void mlStartElement
 (void* userData,

src/Xml2XmlRpcRequestProcessor.cc

@@ -55,7 +55,7 @@ struct SessionData {
 
   SessionData(XmlRpcRequestParserStateMachine* stm):stm_(stm) {}
 };
-}
+} // namespace
 
 static void mlStartElement(void* userData, const xmlChar* name,
                            const xmlChar** attrs)

src/XmlRpcMethodImpl.cc

@@ -137,7 +137,7 @@ const std::string KEY_COMMENT = "comment";
 const std::string KEY_CREATION_DATE = "creationDate";
 const std::string KEY_MODE = "mode";
 const std::string KEY_SERVERS = "servers";
-}
+} // namespace
 
 static SharedHandle<ValueBase> createGIDResponse(gid_t gid)
 {

src/cookie_helper.cc

@@ -63,7 +63,7 @@ std::string::const_iterator getNextDigit
       ++first);
   return first;
 }
-}
+} // namespace
 
 bool parseDate(time_t& time, const std::string& cookieDate)
 {

src/download_helper.cc

@@ -418,7 +418,7 @@ public:
     }
   }
 };
-}
+} // namespace
 
 namespace {
 class StreamProtocolFilter {
@@ -429,7 +429,7 @@ public:
     return detector_.isStreamProtocol(uri);
   }
 };
-}
+} // namespace
 
 void createRequestGroupForUri
 (std::vector<SharedHandle<RequestGroup> >& result,

src/messageDigest.cc

@@ -51,7 +51,7 @@ struct DigestAlgoEntry {
   DigestAlgoEntry(const MessageDigestContext::DigestAlgo& algo, int strength):
     algo(algo), strength(strength) {}
 };
-}
+} // namespace
 
 typedef std::map<std::string, DigestAlgoEntry>
 DigestAlgoMap;

src/util.cc

@@ -266,7 +266,7 @@ bool isUtf8Tail(unsigned char ch)
 {
   return in(ch, 0x80u, 0xbfu);
 }
-}
+} // namespace
 
 bool isUtf8(const std::string& str)
 {