From: Justin Bogner <mail@justinbogner.com>
Date: Tue, 17 Mar 2015 22:31:34 +0000 (+0000)
Subject: MS ABI: Fix a couple of -Winconsistent-missing-override warnings
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=771a27863f42db88554179bc0b225540b89b66a1;p=clang

MS ABI: Fix a couple of -Winconsistent-missing-override warnings

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@232559 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index c402f4abb0..b8dd72f5e3 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -123,7 +123,7 @@ public:
                               int32_t VBPtrOffset, uint32_t VBIndex,
                               raw_ostream &Out) override;
   void mangleCXXHandlerMapEntry(QualType T, bool IsConst, bool IsVolatile,
-                                bool IsReference, raw_ostream &Out);
+                                bool IsReference, raw_ostream &Out) override;
   void mangleCXXRTTI(QualType T, raw_ostream &Out) override;
   void mangleCXXRTTIName(QualType T, raw_ostream &Out) override;
   void mangleCXXRTTIBaseClassDescriptor(const CXXRecordDecl *Derived,
diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp
index 73bbfe071d..f23cd9f948 100644
--- a/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/lib/CodeGen/ItaniumCXXABI.cpp
@@ -126,8 +126,8 @@ public:
   void EmitFundamentalRTTIDescriptor(QualType Type);
   void EmitFundamentalRTTIDescriptors();
   llvm::Constant *getAddrOfRTTIDescriptor(QualType Ty) override;
-  llvm::Constant *getAddrOfCXXHandlerMapEntry(QualType Ty,
-                                              QualType CatchHandlerType) {
+  llvm::Constant *
+  getAddrOfCXXHandlerMapEntry(QualType Ty, QualType CatchHandlerType) override {
     return getAddrOfRTTIDescriptor(Ty);
   }