diff options
author | Nico Weber <nicolasweber@gmx.de> | 2018-01-17 02:55:27 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2018-01-17 02:55:27 +0000 |
commit | 8321ad9ffc1290f914f7065965085d32961fc941 (patch) | |
tree | 5a859f5555053decbf04c04dc8b6b61ce8b5d19b | |
parent | 620a7f765df48da3f78bfd61c5424ae8b2ae5a87 (diff) | |
download | bcm5719-llvm-8321ad9ffc1290f914f7065965085d32961fc941.tar.gz bcm5719-llvm-8321ad9ffc1290f914f7065965085d32961fc941.zip |
Make DiagnosticsEngine() take DiagOpts as DiagnosticsEngine.
No behavior change, but makes it a bit clearer that DiagnosticsEngine adds a
ref to DiagOpts.
llvm-svn: 322611
-rw-r--r-- | clang/include/clang/Basic/Diagnostic.h | 2 | ||||
-rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h index a7458d45618..d87d25f2543 100644 --- a/clang/include/clang/Basic/Diagnostic.h +++ b/clang/include/clang/Basic/Diagnostic.h @@ -402,7 +402,7 @@ private: public: explicit DiagnosticsEngine(IntrusiveRefCntPtr<DiagnosticIDs> Diags, - DiagnosticOptions *DiagOpts, + IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts, DiagnosticConsumer *client = nullptr, bool ShouldOwnClient = true); DiagnosticsEngine(const DiagnosticsEngine &) = delete; diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index 26baa838f8c..5903d72ea5e 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -57,11 +57,11 @@ static void DummyArgToStringFn(DiagnosticsEngine::ArgumentKind AK, intptr_t QT, Output.append(Str.begin(), Str.end()); } -DiagnosticsEngine::DiagnosticsEngine(IntrusiveRefCntPtr<DiagnosticIDs> diags, - DiagnosticOptions *DiagOpts, - DiagnosticConsumer *client, - bool ShouldOwnClient) - : Diags(std::move(diags)), DiagOpts(DiagOpts), Client(nullptr), +DiagnosticsEngine::DiagnosticsEngine( + IntrusiveRefCntPtr<DiagnosticIDs> diags, + IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts, DiagnosticConsumer *client, + bool ShouldOwnClient) + : Diags(std::move(diags)), DiagOpts(std::move(DiagOpts)), Client(nullptr), SourceMgr(nullptr) { setClient(client, ShouldOwnClient); ArgToStringFn = DummyArgToStringFn; |