Skip to content

Commit e7a93ba

Browse files
committed
[clang/cc1_main] Add clang:: namespace prefix to `CachingDiagnosticsProcessor references
This is to fix "error: reference to 'cas' is ambiguous" for a module build. (cherry picked from commit 30159ab)
1 parent b16235c commit e7a93ba

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clang/tools/driver/cc1_main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ class CachingOutputs {
244244
clang::cas::CompileJobCacheResult::Builder CachedResultBuilder;
245245
std::string OutputFile;
246246
std::string DependenciesFile;
247-
std::unique_ptr<cas::CachingDiagnosticsProcessor> DiagProcessor;
247+
std::unique_ptr<clang::cas::CachingDiagnosticsProcessor> DiagProcessor;
248248
};
249249

250250
/// Store and retrieve compilation artifacts using \p llvm::cas::ObjectStore and
@@ -551,8 +551,8 @@ CachingOutputs::CachingOutputs(CompilerInstance &Clang,
551551
OutputFile = fixupRelativePath(FrontendOpts.OutputFile, FM);
552552
DependenciesFile =
553553
fixupRelativePath(Invocation.getDependencyOutputOpts().OutputFile, FM);
554-
DiagProcessor =
555-
std::make_unique<cas::CachingDiagnosticsProcessor>(PrefixMapper, FM);
554+
DiagProcessor = std::make_unique<clang::cas::CachingDiagnosticsProcessor>(
555+
PrefixMapper, FM);
556556
}
557557

558558
Expected<bool> ObjectStoreCachingOutputs::tryReplayCachedResult(

0 commit comments

Comments
 (0)