From 27102091adb0af1a5758f20cbda6f3e1849d52c2 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 27 May 2008 14:55:20 +0000 Subject: [PATCH] 2008-05-27 Tatsuhiro Tsujikawa Fixed compile error on Mac OS X 10.3.9. This error was caused by the name collision of static variable and predefined macro. * src/BtContext.cc * src/BtContext.h * src/CookieBoxFactory.cc * src/CookieBoxFactory.h * src/CookieParser.cc * src/CookieParser.h * src/DefaultBtContext.cc --- ChangeLog | 12 ++++++++++++ src/BtContext.cc | 26 +++++++++++++------------- src/BtContext.h | 26 +++++++++++++------------- src/CookieBoxFactory.cc | 4 ++-- src/CookieBoxFactory.h | 2 +- src/CookieParser.cc | 16 ++++++++-------- src/CookieParser.h | 8 ++++---- src/DefaultBtContext.cc | 28 ++++++++++++++-------------- 8 files changed, 67 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a450acc..2b6c15ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-05-27 Tatsuhiro Tsujikawa + + Fixed compile error on Mac OS X 10.3.9. This error was caused by the + name collision of static variable and predefined macro. + * src/BtContext.cc + * src/BtContext.h + * src/CookieBoxFactory.cc + * src/CookieBoxFactory.h + * src/CookieParser.cc + * src/CookieParser.h + * src/DefaultBtContext.cc + 2008-05-27 Tatsuhiro Tsujikawa * src/RequestGroup.cc diff --git a/src/BtContext.cc b/src/BtContext.cc index 86bd964c..4d306041 100644 --- a/src/BtContext.cc +++ b/src/BtContext.cc @@ -36,30 +36,30 @@ namespace aria2 { -const std::string BtContext::NAME("name"); +const std::string BtContext::C_NAME("name"); -const std::string BtContext::FILES("files"); +const std::string BtContext::C_FILES("files"); -const std::string BtContext::LENGTH("length"); +const std::string BtContext::C_LENGTH("length"); -const std::string BtContext::PATH("path"); +const std::string BtContext::C_PATH("path"); -const std::string BtContext::INFO("info"); +const std::string BtContext::C_INFO("info"); -const std::string BtContext::PIECES("pieces"); +const std::string BtContext::C_PIECES("pieces"); -const std::string BtContext::PIECE_LENGTH("piece length"); +const std::string BtContext::C_PIECE_LENGTH("piece length"); -const std::string BtContext::PRIVATE("private"); +const std::string BtContext::C_PRIVATE("private"); -const std::string BtContext::PRIVATE_ON("1"); +const std::string BtContext::C_PRIVATE_ON("1"); -const std::string BtContext::URL_LIST("url-list"); +const std::string BtContext::C_URL_LIST("url-list"); -const std::string BtContext::ANNOUNCE("announce"); +const std::string BtContext::C_ANNOUNCE("announce"); -const std::string BtContext::ANNOUNCE_LIST("announce-list"); +const std::string BtContext::C_ANNOUNCE_LIST("announce-list"); -const std::string BtContext::NODES("nodes"); +const std::string BtContext::C_NODES("nodes"); } // namespace aria2 diff --git a/src/BtContext.h b/src/BtContext.h index 85559419..3b867e46 100644 --- a/src/BtContext.h +++ b/src/BtContext.h @@ -80,32 +80,32 @@ public: virtual std::deque >& getNodes() = 0; - static const std::string NAME; + static const std::string C_NAME; - static const std::string FILES; + static const std::string C_FILES; - static const std::string LENGTH; + static const std::string C_LENGTH; - static const std::string PATH; + static const std::string C_PATH; - static const std::string INFO; + static const std::string C_INFO; - static const std::string PIECES; + static const std::string C_PIECES; - static const std::string PIECE_LENGTH; + static const std::string C_PIECE_LENGTH; - static const std::string PRIVATE; + static const std::string C_PRIVATE; // This is just a string "1". Used as a value of "private" flag. - static const std::string PRIVATE_ON; + static const std::string C_PRIVATE_ON; - static const std::string URL_LIST; + static const std::string C_URL_LIST; - static const std::string ANNOUNCE; + static const std::string C_ANNOUNCE; - static const std::string ANNOUNCE_LIST; + static const std::string C_ANNOUNCE_LIST; - static const std::string NODES; + static const std::string C_NODES; }; diff --git a/src/CookieBoxFactory.cc b/src/CookieBoxFactory.cc index d6e104ec..a3c74ecc 100644 --- a/src/CookieBoxFactory.cc +++ b/src/CookieBoxFactory.cc @@ -42,7 +42,7 @@ namespace aria2 { -const std::string CookieBoxFactory::TRUE("TRUE"); +const std::string CookieBoxFactory::C_TRUE("TRUE"); CookieBoxHandle CookieBoxFactory::createNewInstance() { @@ -80,7 +80,7 @@ Cookie CookieBoxFactory::parseNsCookie(const std::string& nsCookieStr) const } c.domain = vs[0]; c.path = vs[2]; - c.secure = vs[3] == TRUE ? true : false; + c.secure = vs[3] == C_TRUE ? true : false; int64_t expireDate = Util::parseLLInt(vs[4]); // TODO assuming time_t is int32_t... if(expireDate > INT32_MAX) { diff --git a/src/CookieBoxFactory.h b/src/CookieBoxFactory.h index e2cedd53..01f01567 100644 --- a/src/CookieBoxFactory.h +++ b/src/CookieBoxFactory.h @@ -67,7 +67,7 @@ public: } private: - static const std::string TRUE; + static const std::string C_TRUE; }; typedef SharedHandle CookieBoxFactoryHandle; diff --git a/src/CookieParser.cc b/src/CookieParser.cc index d02eccd1..a88da341 100644 --- a/src/CookieParser.cc +++ b/src/CookieParser.cc @@ -41,23 +41,23 @@ namespace aria2 { -const std::string CookieParser::SECURE("secure"); +const std::string CookieParser::C_SECURE("secure"); -const std::string CookieParser::DOMAIN("domain"); +const std::string CookieParser::C_DOMAIN("domain"); -const std::string CookieParser::PATH("path"); +const std::string CookieParser::C_PATH("path"); -const std::string CookieParser::EXPIRES("expires"); +const std::string CookieParser::C_EXPIRES("expires"); void CookieParser::setField(Cookie& cookie, const std::string& name, const std::string& value) const { - if(name == SECURE) { + if(name == C_SECURE) { cookie.secure = true; - } else if(name == DOMAIN) { + } else if(name == C_DOMAIN) { cookie.domain = value; - } else if(name == PATH) { + } else if(name == C_PATH) { cookie.path = value; - } else if(name == EXPIRES) { + } else if(name == C_EXPIRES) { cookie.expires = Util::httpGMT(value); cookie.onetime = false; } else { diff --git a/src/CookieParser.h b/src/CookieParser.h index 0c2d0390..e29aa0d4 100644 --- a/src/CookieParser.h +++ b/src/CookieParser.h @@ -58,13 +58,13 @@ public: Cookies parse(std::istream& s) const; private: - static const std::string SECURE; + static const std::string C_SECURE; - static const std::string DOMAIN; + static const std::string C_DOMAIN; - static const std::string PATH; + static const std::string C_PATH; - static const std::string EXPIRES; + static const std::string C_EXPIRES; }; typedef SharedHandle CookieParserHandle; diff --git a/src/DefaultBtContext.cc b/src/DefaultBtContext.cc index 06169b91..9d269b15 100644 --- a/src/DefaultBtContext.cc +++ b/src/DefaultBtContext.cc @@ -115,13 +115,13 @@ void DefaultBtContext::extractPieceHash(const unsigned char* hashData, void DefaultBtContext::extractFileEntries(const Dictionary* infoDic, const std::string& defaultName, const std::deque& urlList) { - const Data* nameData = dynamic_cast(infoDic->get(BtContext::NAME)); + const Data* nameData = dynamic_cast(infoDic->get(BtContext::C_NAME)); if(nameData) { name = nameData->toString(); } else { name = File(defaultName).getBasename()+".file"; } - const List* files = dynamic_cast(infoDic->get(BtContext::FILES)); + const List* files = dynamic_cast(infoDic->get(BtContext::C_FILES)); if(files) { uint64_t length = 0; off_t offset = 0; @@ -135,7 +135,7 @@ void DefaultBtContext::extractFileEntries(const Dictionary* infoDic, continue; } const Data* lengthData = - dynamic_cast(fileDic->get(BtContext::LENGTH)); + dynamic_cast(fileDic->get(BtContext::C_LENGTH)); if(lengthData) { length += lengthData->toLLInt(); } else { @@ -143,7 +143,7 @@ void DefaultBtContext::extractFileEntries(const Dictionary* infoDic, (StringFormat(MSG_SOMETHING_MISSING_IN_TORRENT, "file length").str()); } const List* pathList = - dynamic_cast(fileDic->get(BtContext::PATH)); + dynamic_cast(fileDic->get(BtContext::C_PATH)); if(!pathList) { throw DlAbortEx (StringFormat(MSG_SOMETHING_MISSING_IN_TORRENT, "file path list").str()); @@ -182,7 +182,7 @@ void DefaultBtContext::extractFileEntries(const Dictionary* infoDic, // single-file mode; fileMode = BtContext::SINGLE; const Data* length = - dynamic_cast(infoDic->get(BtContext::LENGTH)); + dynamic_cast(infoDic->get(BtContext::C_LENGTH)); if(length) { totalLength = length->toLLInt(); } else { @@ -296,7 +296,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st { clear(); const Dictionary* infoDic = - dynamic_cast(rootDic->get(BtContext::INFO)); + dynamic_cast(rootDic->get(BtContext::C_INFO)); if(!infoDic) { throw DlAbortEx (StringFormat(MSG_SOMETHING_MISSING_IN_TORRENT, "info directory").str()); @@ -311,7 +311,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st infoHashString = Util::toHex(infoHash, INFO_HASH_LENGTH); // calculate the number of pieces const Data* pieceHashData = - dynamic_cast(infoDic->get(BtContext::PIECES)); + dynamic_cast(infoDic->get(BtContext::C_PIECES)); if(!pieceHashData) { throw DlAbortEx (StringFormat(MSG_SOMETHING_MISSING_IN_TORRENT, "pieces").str()); @@ -325,7 +325,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st } // retrieve piece length const Data* pieceLengthData = - dynamic_cast(infoDic->get(BtContext::PIECE_LENGTH)); + dynamic_cast(infoDic->get(BtContext::C_PIECE_LENGTH)); if(!pieceLengthData) { throw DlAbortEx (StringFormat(MSG_SOMETHING_MISSING_IN_TORRENT, "piece length").str()); @@ -335,9 +335,9 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st extractPieceHash(pieceHashData->getData(), pieceHashData->getLen(), PIECE_HASH_LENGTH); const Data* privateFlag = - dynamic_cast(infoDic->get(BtContext::PRIVATE)); + dynamic_cast(infoDic->get(BtContext::C_PRIVATE)); if(privateFlag) { - if(privateFlag->toString() == BtContext::PRIVATE_ON) { + if(privateFlag->toString() == BtContext::C_PRIVATE_ON) { _private = true; } } @@ -345,7 +345,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st // This implemantation obeys HTTP-Seeding specification: // see http://www.getright.com/seedtorrent.html std::deque urlList; - extractUrlList(urlList, rootDic->get(BtContext::URL_LIST)); + extractUrlList(urlList, rootDic->get(BtContext::C_URL_LIST)); // retrieve file entries extractFileEntries(infoDic, defaultName, urlList); if((totalLength+pieceLength-1)/pieceLength != numPieces) { @@ -353,9 +353,9 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st } // retrieve announce const Data* announceData = - dynamic_cast(rootDic->get(BtContext::ANNOUNCE)); + dynamic_cast(rootDic->get(BtContext::C_ANNOUNCE)); const List* announceListData = - dynamic_cast(rootDic->get(BtContext::ANNOUNCE_LIST)); + dynamic_cast(rootDic->get(BtContext::C_ANNOUNCE_LIST)); if(announceListData) { extractAnnounceList(announceListData); } else if(announceData) { @@ -363,7 +363,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st } // retrieve nodes const List* nodes = - dynamic_cast(rootDic->get(BtContext::NODES)); + dynamic_cast(rootDic->get(BtContext::C_NODES)); if(nodes) { extractNodes(nodes); }