diff options
| author | Michael Spencer <bigcheesegs@gmail.com> | 2019-10-30 15:53:25 -0700 | 
|---|---|---|
| committer | Michael Spencer <bigcheesegs@gmail.com> | 2019-10-30 15:53:38 -0700 | 
| commit | 17b64e36e90ad05a32a99b9f5784b55310cc10e8 (patch) | |
| tree | 1388c64fe2e69dbe4ae94c4bda1f7417086c5ed4 /clang/lib | |
| parent | adadc665f83a588e2cbcb5e9f4675d1a5c5cda2d (diff) | |
| download | bcm5719-llvm-17b64e36e90ad05a32a99b9f5784b55310cc10e8.tar.gz bcm5719-llvm-17b64e36e90ad05a32a99b9f5784b55310cc10e8.zip  | |
[clang][ScanDeps] Fix shadowing warning.
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp index bffd7c33812..4b10f24167a 100644 --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp @@ -85,7 +85,7 @@ DependencyScanningTool::getDependencyFile(const std::string &Input,      }      void handleModuleDependency(ModuleDeps MD) override { -      ModuleDeps[MD.ContextHash + MD.ModuleName] = std::move(MD); +      ClangModuleDeps[MD.ContextHash + MD.ModuleName] = std::move(MD);      }      void handleContextHash(std::string Hash) override { @@ -95,7 +95,7 @@ DependencyScanningTool::getDependencyFile(const std::string &Input,      void printDependencies(std::string &S, StringRef MainFile) {        // Sort the modules by name to get a deterministic order.        std::vector<StringRef> Modules; -      for (auto &&Dep : ModuleDeps) +      for (auto &&Dep : ClangModuleDeps)          Modules.push_back(Dep.first);        std::sort(Modules.begin(), Modules.end()); @@ -105,14 +105,14 @@ DependencyScanningTool::getDependencyFile(const std::string &Input,        Array Imports;        for (auto &&ModName : Modules) { -        auto &MD = ModuleDeps[ModName]; +        auto &MD = ClangModuleDeps[ModName];          if (MD.ImportedByMainFile)            Imports.push_back(MD.ModuleName);        }        Array Mods;        for (auto &&ModName : Modules) { -        auto &MD = ModuleDeps[ModName]; +        auto &MD = ClangModuleDeps[ModName];          Object Mod{              {"name", MD.ModuleName},              {"file-deps", toJSONSorted(MD.FileDeps)}, @@ -136,7 +136,7 @@ DependencyScanningTool::getDependencyFile(const std::string &Input,    private:      std::vector<std::string> Dependencies; -    std::unordered_map<std::string, ModuleDeps> ModuleDeps; +    std::unordered_map<std::string, ModuleDeps> ClangModuleDeps;      std::string ContextHash;    };  | 

