@@ -3021,9 +3021,9 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
30213021 const auto ins = mNameMap .insert (std::make_pair (simplecpp::simplifyPath (header), nullptr ));
30223022
30233023 if (ins.second ) {
3024- const auto load = tryload (ins.first , dui, filenames, outputList);
3025- if (load .first != nullptr )
3026- return load ;
3024+ const auto ret = tryload (ins.first , dui, filenames, outputList);
3025+ if (ret .first != nullptr )
3026+ return ret ;
30273027 }
30283028 else {
30293029 return std::make_pair (ins.first ->second , false );
@@ -3036,9 +3036,9 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
30363036 const auto ins = mNameMap .insert (std::make_pair (simplecpp::simplifyPath (dirPath (sourcefile) + header), nullptr ));
30373037
30383038 if (ins.second ) {
3039- const auto load = tryload (ins.first , dui, filenames, outputList);
3040- if (load .first != nullptr )
3041- return load ;
3039+ const auto ret = tryload (ins.first , dui, filenames, outputList);
3040+ if (ret .first != nullptr )
3041+ return ret ;
30423042 }
30433043 else if (ins.first ->second != nullptr ) {
30443044 return std::make_pair (ins.first ->second , false );
@@ -3049,9 +3049,9 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
30493049 const auto ins = mNameMap .insert (std::make_pair (simplecpp::simplifyPath (includePath + " /" + header), nullptr ));
30503050
30513051 if (ins.second ) {
3052- const auto load = tryload (ins.first , dui, filenames, outputList);
3053- if (load .first != nullptr )
3054- return load ;
3052+ const auto ret = tryload (ins.first , dui, filenames, outputList);
3053+ if (ret .first != nullptr )
3054+ return ret ;
30553055 }
30563056 else if (ins.first ->second != nullptr ) {
30573057 return std::make_pair (ins.first ->second , false );
0 commit comments