@@ -2318,7 +2318,7 @@ namespace simplecpp {
23182318 * @return token after B
23192319 */
23202320 const Token *expandHashHash (TokenList &output, const Location &loc, const Token *tok, const MacroMap ¯os, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> ¶metertokens, bool expandResult=true ) const {
2321- Token *A = output.back ();
2321+ Token * const A = output.back ();
23222322 if (!A)
23232323 throw invalidHashHash (tok->location , name (), " Missing first argument" );
23242324 if (!sameline (tok, tok->next ) || !sameline (tok, tok->next ->next ))
@@ -3102,7 +3102,7 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
31023102 return " " ;
31033103}
31043104
3105- std::pair<simplecpp::FileData *, bool > simplecpp::FileDataCache::tryload (FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
3105+ std::pair<simplecpp::FileData *, bool > simplecpp::FileDataCache::tryload (FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList * const outputList)
31063106{
31073107 const std::string &path = name_it->first ;
31083108 FileID fileId;
@@ -3214,7 +3214,7 @@ bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
32143214#endif
32153215}
32163216
3217- simplecpp::FileDataCache simplecpp::load (const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, FileDataCache cache)
3217+ simplecpp::FileDataCache simplecpp::load (const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList * const outputList, FileDataCache cache)
32183218{
32193219#ifdef SIMPLECPP_WINDOWS
32203220 if (dui.clearIncludeCache )
@@ -3297,7 +3297,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
32973297 return cache;
32983298}
32993299
3300- static bool preprocessToken (simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap ¯os, std::vector<std::string> &files, simplecpp::OutputList *outputList)
3300+ static bool preprocessToken (simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap ¯os, std::vector<std::string> &files, simplecpp::OutputList * const outputList)
33013301{
33023302 const simplecpp::Token * const tok = tok1;
33033303 const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find (tok->str ()) : macros.end ();
@@ -3351,7 +3351,7 @@ static std::string getTimeDefine(const struct tm * const timep)
33513351 return std::string (" \" " ).append (buf).append (" \" " );
33523352}
33533353
3354- void simplecpp::preprocess (simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
3354+ void simplecpp::preprocess (simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList * const outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
33553355{
33563356#ifdef SIMPLECPP_WINDOWS
33573357 if (dui.clearIncludeCache )
0 commit comments