Skip to content

Commit e04284c

Browse files
committed
Move function up to prevent merge conflicts
1 parent 8079a6f commit e04284c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ class DependencyScanningWorker {
7474
public:
7575
DependencyScanningWorker(DependencyScanningService &Service);
7676

77+
/// Run the dependency scanning tool for a given clang driver invocation, and
78+
/// report the discovered dependencies to the provided consumer.
79+
///
80+
/// \returns A \c StringError with the diagnostic output if clang errors
81+
/// occurred, success otherwise.
82+
llvm::Error
83+
computeDependenciesForClangInvocation(StringRef WorkingDirectory,
84+
ArrayRef<std::string> Arguments,
85+
DependencyConsumer &Consumer);
86+
7787
/// Run the dependency scanning tool for a given clang driver invocation (as
7888
/// specified for the given Input in the CDB), and report the discovered
7989
/// dependencies to the provided consumer.
@@ -85,16 +95,6 @@ class DependencyScanningWorker {
8595
const CompilationDatabase &CDB,
8696
DependencyConsumer &Consumer);
8797

88-
/// Run the dependency scanning tool for a given clang driver invocation, and
89-
/// report the discovered dependencies to the provided consumer.
90-
///
91-
/// \returns A \c StringError with the diagnostic output if clang errors
92-
/// occurred, success otherwise.
93-
llvm::Error
94-
computeDependenciesForClangInvocation(StringRef WorkingDirectory,
95-
ArrayRef<std::string> Arguments,
96-
DependencyConsumer &Consumer);
97-
9898
ScanningOutputFormat getFormat() const { return Format; }
9999

100100
llvm::StringSet<> AlreadySeen;

0 commit comments

Comments
 (0)