From e7a69158635a30cb673e443a3b95ece359c72cc1 Mon Sep 17 00:00:00 2001 From: Michael Liao Date: Tue, 20 Oct 2020 10:19:44 -0400 Subject: [PATCH] Revert "[clang] Fix warnings on the missing of explicitly copy constructor on the base class. NFC." This reverts commit 1ed506deaddb41870d22f5b48d52ba710e8d6c00. --- clang/include/clang/Basic/Diagnostic.h | 2 +- clang/include/clang/Basic/PartialDiagnostic.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h index 3895e1f..f17b98f 100644 --- a/clang/include/clang/Basic/Diagnostic.h +++ b/clang/include/clang/Basic/Diagnostic.h @@ -1284,7 +1284,7 @@ protected: public: /// Copy constructor. When copied, this "takes" the diagnostic info from the /// input and neuters it. - DiagnosticBuilder(const DiagnosticBuilder &D) : StreamingDiagnostic(D) { + DiagnosticBuilder(const DiagnosticBuilder &D) { DiagObj = D.DiagObj; DiagStorage = D.DiagStorage; IsActive = D.IsActive; diff --git a/clang/include/clang/Basic/PartialDiagnostic.h b/clang/include/clang/Basic/PartialDiagnostic.h index 9ddf64d..9e01790 100644 --- a/clang/include/clang/Basic/PartialDiagnostic.h +++ b/clang/include/clang/Basic/PartialDiagnostic.h @@ -49,8 +49,7 @@ public: PartialDiagnostic(unsigned DiagID, DiagStorageAllocator &Allocator_) : StreamingDiagnostic(Allocator_), DiagID(DiagID) {} - PartialDiagnostic(const PartialDiagnostic &Other) - : StreamingDiagnostic(Other), DiagID(Other.DiagID) { + PartialDiagnostic(const PartialDiagnostic &Other) : DiagID(Other.DiagID) { Allocator = Other.Allocator; if (Other.DiagStorage) { DiagStorage = getStorage(); -- 2.7.4