From 236e64cb25a054eed3fa8888168e71d09decf561 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 30 Oct 2010 16:02:15 +0000 Subject: 2010-10-30 Tatsuhiro Tsujikawa Use unnamed namespace instead of static keyword. * src/AbstractCommand.cc * src/AdaptiveURISelector.cc * src/Base64.cc * src/BitfieldMan.cc * src/BtDependency.cc * src/ConsoleStatCalc.cc * src/ContentTypeRequestGroupCriteria.cc * src/CookieStorage.cc * src/DHTMessageFactoryImpl.cc * src/DHTRoutingTableDeserializer.cc * src/DefaultBtAnnounce.cc * src/DefaultBtProgressInfoFile.cc * src/DefaultPeerStorage.cc * src/DefaultPieceStorage.cc * src/DownloadCommand.cc * src/DownloadEngine.cc * src/EpollEventPoll.cc * src/ExpatMetalinkProcessor.cc * src/ExpatXmlRpcRequestProcessor.cc * src/FileEntry.cc * src/HttpRequest.cc * src/HttpRequestCommand.cc * src/HttpResponseCommand.cc * src/KqueueEventPoll.cc * src/LongestSequencePieceSelector.cc * src/MetalinkParserStateV3Impl.cc * src/MetalinkParserStateV4Impl.cc * src/MultiDiskAdaptor.cc * src/MultiUrlRequestInfo.cc * src/OptionParser.cc * src/PeerSessionResource.cc * src/PortEventPoll.cc * src/Request.cc * src/RequestGroupMan.cc * src/SelectEventPoll.cc * src/SessionSerializer.cc * src/SimpleLogFormatter.cc * src/Sqlite3CookieParser.cc * src/TrackerWatcherCommand.cc * src/XML2SAXMetalinkProcessor.cc * src/Xml2XmlRpcRequestProcessor.cc * src/XmlRpcMethod.cc * src/XmlRpcMethodImpl.cc * src/XmlRpcResponse.cc * src/base32.cc * src/bencode2.cc * src/bittorrent_helper.cc * src/download_helper.cc * src/main.cc * src/messageDigest.cc * src/option_processing.cc * src/util.cc * test/AnnounceListTest.cc * test/BtRegistryTest.cc * test/DHTBucketTest.cc * test/DHTRoutingTableTest.cc * test/DefaultBtAnnounceTest.cc * test/FileEntryTest.cc * test/FtpConnectionTest.cc * test/MSEHandshakeTest.cc * test/MagnetTest.cc * test/XmlRpcMethodTest.cc * test/array_funTest.cc --- src/SessionSerializer.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/SessionSerializer.cc') diff --git a/src/SessionSerializer.cc b/src/SessionSerializer.cc index 4310aa67..58335cdd 100644 --- a/src/SessionSerializer.cc +++ b/src/SessionSerializer.cc @@ -77,15 +77,18 @@ bool SessionSerializer::save(const std::string& filename) const } -static const std::vector& getCumulativeOpts() +namespace { +const std::vector& getCumulativeOpts() { static std::string cumulativeOpts[] = { PREF_INDEX_OUT, PREF_HEADER }; static std::vector opts (vbegin(cumulativeOpts), vend(cumulativeOpts)); return opts; } +} // namespace -static bool inCumulativeOpts(const std::string& opt) +namespace { +bool inCumulativeOpts(const std::string& opt) { const std::vector& cumopts = getCumulativeOpts(); for(std::vector::const_iterator itr = cumopts.begin(), @@ -96,8 +99,10 @@ static bool inCumulativeOpts(const std::string& opt) } return false; } +} // namespace -static void writeOption(std::ostream& out, const SharedHandle