diff --git a/ChangeLog b/ChangeLog index 7b91b37c..862b3759 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +2010-10-30 Tatsuhiro Tsujikawa + + 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 Removed unnecessary unnamed namespace diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index e7fed27a..8fc74f81 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -574,7 +574,7 @@ public: } } }; -} +} // namespace static bool inNoProxy(const SharedHandle& req, const std::string& noProxy) diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc index 3b4cd6e7..3533ab37 100644 --- a/src/AnnounceList.cc +++ b/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()); diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc index 1459f75b..3ff4993b 100644 --- a/src/BtSeederStateChoke.cc +++ b/src/BtSeederStateChoke.cc @@ -124,7 +124,7 @@ public: peer->chokingRequired(true); } }; -} +} // namespace void BtSeederStateChoke::executeChoke diff --git a/src/ConsoleStatCalc.cc b/src/ConsoleStatCalc.cc index 3a63514b..a7d2aee9 100644 --- a/src/ConsoleStatCalc.cc +++ b/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 >& groups, size_t cols, diff --git a/src/CookieStorage.cc b/src/CookieStorage.cc index a4875267..4582edb4 100644 --- a/src/CookieStorage.cc +++ b/src/CookieStorage.cc @@ -180,7 +180,7 @@ public: return cookiePathDivider.cookie_; } }; -} +} // namespace namespace { class OrderByPathDepthDesc:public std::binary_function { @@ -209,7 +209,7 @@ public: lhs.cookie_.getCreationTime() < rhs.cookie_.getCreationTime()); } }; -} +} // namespace namespace { template @@ -228,7 +228,7 @@ void searchCookieByDomainSuffix (*i).findCookie(out, requestHost, requestPath, now, secure); } } -} +} // namespace bool CookieStorage::contains(const Cookie& cookie) const { diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index a54cb89b..acaa04ad 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -266,7 +266,7 @@ public: return node->isQuestionable(); } }; -} +} // namespace bool DHTBucket::containsQuestionableNode() const { diff --git a/src/DHTPeerAnnounceEntry.cc b/src/DHTPeerAnnounceEntry.cc index b7bffb0a..53661c57 100644 --- a/src/DHTPeerAnnounceEntry.cc +++ b/src/DHTPeerAnnounceEntry.cc @@ -82,7 +82,7 @@ public: } } }; -} +} // namespace void DHTPeerAnnounceEntry::removeStalePeerAddrEntry(time_t timeout) { diff --git a/src/DHTPeerAnnounceStorage.cc b/src/DHTPeerAnnounceStorage.cc index e1359264..c7bf2426 100644 --- a/src/DHTPeerAnnounceStorage.cc +++ b/src/DHTPeerAnnounceStorage.cc @@ -66,7 +66,7 @@ public: return memcmp(lhs->getInfoHash(), rhs->getInfoHash(), DHT_ID_LENGTH) < 0; } }; -} +} // namespace SharedHandle DHTPeerAnnounceStorage::getPeerAnnounceEntry(const unsigned char* infoHash) @@ -127,7 +127,7 @@ public: e->removeStalePeerAddrEntry(DHT_PEER_ANNOUNCE_PURGE_INTERVAL); } }; -} +} // namespace void DHTPeerAnnounceStorage::handleTimeout() { diff --git a/src/DHTTaskQueueImpl.cc b/src/DHTTaskQueueImpl.cc index 2c46f514..02804ece 100644 --- a/src/DHTTaskQueueImpl.cc +++ b/src/DHTTaskQueueImpl.cc @@ -41,7 +41,7 @@ namespace aria2 { namespace { const size_t NUM_CONCURRENT_TASK = 5; -} +} // namespace DHTTaskQueueImpl::DHTTaskQueueImpl(): periodicTaskQueue1_(NUM_CONCURRENT_TASK), diff --git a/src/DefaultBtMessageDispatcher.cc b/src/DefaultBtMessageDispatcher.cc index 213364b5..3d90653a 100644 --- a/src/DefaultBtMessageDispatcher.cc +++ b/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) { diff --git a/src/DefaultBtRequestFactory.cc b/src/DefaultBtRequestFactory.cc index 711532d4..005e0786 100644 --- a/src/DefaultBtRequestFactory.cc +++ b/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() { diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc index 37bcdd7c..eed13b55 100644 --- a/src/DefaultPeerStorage.cc +++ b/src/DefaultPeerStorage.cc @@ -78,7 +78,7 @@ public: (peer_->getPort() == peer->getPort())); } }; -} +} // namespace bool DefaultPeerStorage::isPeerAlreadyAdded(const SharedHandle& peer) { @@ -151,7 +151,7 @@ public: return peer->unused() && peer->isGood(); } }; -} +} // namespace SharedHandle DefaultPeerStorage::getUnusedPeer() { std::deque >::const_iterator itr = @@ -176,7 +176,7 @@ public: return ipaddr == peer->getIPAddress() && port == peer->getPort(); } }; -} +} // namespace SharedHandle DefaultPeerStorage::getPeer(const std::string& ipaddr, uint16_t port) const { @@ -212,7 +212,7 @@ public: } } }; -} +} // namespace void DefaultPeerStorage::getActivePeers (std::vector >& activePeers) diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc index fe6d0144..666398ff 100644 --- a/src/DefaultPieceStorage.cc +++ b/src/DefaultPieceStorage.cc @@ -659,7 +659,7 @@ public: } } }; -} +} // namespace void DefaultPieceStorage::removeAdvertisedPiece(time_t elapsed) { diff --git a/src/ExpatMetalinkProcessor.cc b/src/ExpatMetalinkProcessor.cc index 2f5bfbee..51c1bfe9 100644 --- a/src/ExpatMetalinkProcessor.cc +++ b/src/ExpatMetalinkProcessor.cc @@ -58,7 +58,7 @@ public: SessionData(const SharedHandle& stm):stm_(stm) {} }; -} +} // namespace static void splitNsName (std::string& localname, std::string& prefix, std::string& nsUri, diff --git a/src/ExpatXmlRpcRequestProcessor.cc b/src/ExpatXmlRpcRequestProcessor.cc index 757f53b2..ad24aadc 100644 --- a/src/ExpatXmlRpcRequestProcessor.cc +++ b/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) { diff --git a/src/FeedbackURISelector.cc b/src/FeedbackURISelector.cc index 9b26c9bd..2efc6c11 100644 --- a/src/FeedbackURISelector.cc +++ b/src/FeedbackURISelector.cc @@ -65,7 +65,7 @@ public: return lhs.first->getDownloadSpeed() > rhs.first->getDownloadSpeed(); } }; -} +} // namespace std::string FeedbackURISelector::select (FileEntry* fileEntry, diff --git a/src/FileEntry.cc b/src/FileEntry.cc index a709294c..d98dcd91 100644 --- a/src/FileEntry.cc +++ b/src/FileEntry.cc @@ -221,7 +221,7 @@ public: lhs->getPeerStat()->getAvgDownloadSpeed() > rhs->getPeerStat()->getAvgDownloadSpeed(); } }; -} +} // namespace void FileEntry::storePool(const SharedHandle& request) { @@ -301,7 +301,7 @@ public: return uriResult.getResult() == r_; } }; -} +} // namespace void FileEntry::extractURIResult (std::deque& res, downloadresultcode::RESULT r) diff --git a/src/GZipEncoder.cc b/src/GZipEncoder.cc index 9b78bd4f..ab2a03ea 100644 --- a/src/GZipEncoder.cc +++ b/src/GZipEncoder.cc @@ -44,7 +44,7 @@ namespace aria2 { namespace { const int OUTBUF_LENGTH = 4096; -} +} // namespace GZipEncoder::GZipEncoder():strm_(0), finished_(false) {} diff --git a/src/Metalink2RequestGroup.cc b/src/Metalink2RequestGroup.cc index 30d0a6c5..cc7ec657 100644 --- a/src/Metalink2RequestGroup.cc +++ b/src/Metalink2RequestGroup.cc @@ -89,7 +89,7 @@ public: } } }; -} +} // namespace namespace { class FindBitTorrentUri { @@ -104,7 +104,7 @@ public: } } }; -} +} // namespace void Metalink2RequestGroup::generate diff --git a/src/MetalinkEntry.cc b/src/MetalinkEntry.cc index f9e1a57d..24e5711a 100644 --- a/src/MetalinkEntry.cc +++ b/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(), diff --git a/src/MetalinkParserStateV3Impl.cc b/src/MetalinkParserStateV3Impl.cc index 34a263e5..bc65e7e8 100644 --- a/src/MetalinkParserStateV3Impl.cc +++ b/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 static typename Container::const_iterator findAttr diff --git a/src/MetalinkParserStateV4Impl.cc b/src/MetalinkParserStateV4Impl.cc index bfa4d0d6..7d95bb76 100644 --- a/src/MetalinkParserStateV4Impl.cc +++ b/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 static typename Container::const_iterator findAttr diff --git a/src/Metalinker.cc b/src/Metalinker.cc index a96907be..8b1cd85e 100644 --- a/src/Metalinker.cc +++ b/src/Metalinker.cc @@ -76,7 +76,7 @@ public: return true; } }; -} +} // namespace void Metalinker::queryEntry (std::vector >& queryResult, diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc index 4fff13d6..ff14d5ab 100644 --- a/src/MultiDiskAdaptor.cc +++ b/src/MultiDiskAdaptor.cc @@ -361,7 +361,7 @@ public: return offset < dwe->getFileEntry()->getOffset(); } }; -} +} // namespace static DiskWriterEntries::const_iterator findFirstDiskWriterEntry diff --git a/src/Netrc.cc b/src/Netrc.cc index d4672a2b..2ba523b9 100644 --- a/src/Netrc.cc +++ b/src/Netrc.cc @@ -162,7 +162,7 @@ public: return authenticator->match(hostname); } }; -} +} // namespace SharedHandle Netrc::findAuthenticator(const std::string& hostname) const diff --git a/src/NsCookieParser.cc b/src/NsCookieParser.cc index 9d3c3c1b..df456aa2 100644 --- a/src/NsCookieParser.cc +++ b/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 NsCookieParser::parse (const std::string& filename, time_t creationTime) diff --git a/src/OptionParser.cc b/src/OptionParser.cc index ec75605f..a29f5225 100644 --- a/src/OptionParser.cc +++ b/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 > OptionParser::findByTag(const std::string& tag) const @@ -283,7 +283,7 @@ public: optionHandler->getName().find(substring_) != std::string::npos; } }; -} +} // namespace std::vector > OptionParser::findByNameSubstring(const std::string& substring) const @@ -347,7 +347,7 @@ public: return !optionHandler->isHidden() && optionHandler->getOptionID() == id_; } }; -} +} // namespace SharedHandle OptionParser::findByID(int id) const { @@ -369,7 +369,7 @@ public: optionHandler->getShortName() == shortName_; } }; -} +} // namespace SharedHandle OptionParser::findByShortName(char shortName) const { diff --git a/src/PieceStatMan.cc b/src/PieceStatMan.cc index a00ed818..af442f43 100644 --- a/src/PieceStatMan.cc +++ b/src/PieceStatMan.cc @@ -69,7 +69,7 @@ public: return SharedHandle(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) diff --git a/src/RarestPieceSelector.cc b/src/RarestPieceSelector.cc index 62fc3927..715a9f23 100644 --- a/src/RarestPieceSelector.cc +++ b/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 diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc index e7a648d2..0cbb1df4 100644 --- a/src/RequestGroupMan.cc +++ b/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() { diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc index df978c57..ced3df30 100644 --- a/src/SegmentMan.cc +++ b/src/SegmentMan.cc @@ -318,7 +318,7 @@ public: return segmentEntry->segment->getIndex() == segment_->getIndex(); } }; -} +} // namespace bool SegmentMan::completeSegment (cuid_t cuid, const SharedHandle& segment) { @@ -384,7 +384,7 @@ public: peerStat_->getProtocol() == p->getProtocol(); } }; -} +} // namespace void SegmentMan::updateFastestPeerStat(const SharedHandle& peerStat) { @@ -445,7 +445,7 @@ public: return ps->getSessionDownloadLength()+total; } }; -} +} // namespace uint64_t SegmentMan::calculateSessionDownloadLength() const { diff --git a/src/ServerStatMan.cc b/src/ServerStatMan.cc index d6663cb8..ba74481e 100644 --- a/src/ServerStatMan.cc +++ b/src/ServerStatMan.cc @@ -154,7 +154,7 @@ public: return ss->getLastUpdated().difference(time_) >= timeout_; } }; -} +} // namespace void ServerStatMan::removeStaleServerStat(time_t timeout) { diff --git a/src/SocketCore.cc b/src/SocketCore.cc index 03eb4c5b..a7d196e9 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -1315,7 +1315,7 @@ int getDefaultAIFlags() return defaultAIFlags; } -} +} // namespace void setDefaultAIFlags(int flags) { diff --git a/src/XML2SAXMetalinkProcessor.cc b/src/XML2SAXMetalinkProcessor.cc index fc2048f6..c94e733f 100644 --- a/src/XML2SAXMetalinkProcessor.cc +++ b/src/XML2SAXMetalinkProcessor.cc @@ -56,7 +56,7 @@ public: SessionData(const SharedHandle& stm):stm_(stm) {} }; -} +} // namespace static void mlStartElement (void* userData, diff --git a/src/Xml2XmlRpcRequestProcessor.cc b/src/Xml2XmlRpcRequestProcessor.cc index 40a8d162..498ab5c2 100644 --- a/src/Xml2XmlRpcRequestProcessor.cc +++ b/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) diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc index 6a56e70d..e0ba49a1 100644 --- a/src/XmlRpcMethodImpl.cc +++ b/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 createGIDResponse(gid_t gid) { diff --git a/src/cookie_helper.cc b/src/cookie_helper.cc index 69b2366f..26de1c9c 100644 --- a/src/cookie_helper.cc +++ b/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) { diff --git a/src/download_helper.cc b/src/download_helper.cc index 4b9765f8..54cee855 100644 --- a/src/download_helper.cc +++ b/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 >& result, diff --git a/src/messageDigest.cc b/src/messageDigest.cc index 1f5c00e2..9db9a9a3 100644 --- a/src/messageDigest.cc +++ b/src/messageDigest.cc @@ -51,7 +51,7 @@ struct DigestAlgoEntry { DigestAlgoEntry(const MessageDigestContext::DigestAlgo& algo, int strength): algo(algo), strength(strength) {} }; -} +} // namespace typedef std::map DigestAlgoMap; diff --git a/src/util.cc b/src/util.cc index e984de25..ba46faa2 100644 --- a/src/util.cc +++ b/src/util.cc @@ -266,7 +266,7 @@ bool isUtf8Tail(unsigned char ch) { return in(ch, 0x80u, 0xbfu); } -} +} // namespace bool isUtf8(const std::string& str) {