<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal">This patch fixes PR15827, add override options was not checking if the method declaration was in the main file.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">diff --git a/cpp11-migrate/AddOverride/AddOverrideActions.cpp b/cpp11-migrate/AddOverride/AddOverrideActions.cpp<o:p></o:p></p>
<p class="MsoNormal">index a40f673..3d1f1ff 100644<o:p></o:p></p>
<p class="MsoNormal">--- a/cpp11-migrate/AddOverride/AddOverrideActions.cpp<o:p></o:p></p>
<p class="MsoNormal">+++ b/cpp11-migrate/AddOverride/AddOverrideActions.cpp<o:p></o:p></p>
<p class="MsoNormal">@@ -30,10 +30,14 @@ void AddOverrideFixer::run(const MatchFinder::MatchResult &Result) {<o:p></o:p></p>
<p class="MsoNormal"> SourceManager &SM = *Result.SourceManager;<o:p></o:p></p>
<p class="MsoNormal"><o:p></o:p></p>
<p class="MsoNormal"> const CXXMethodDecl *M = Result.Nodes.getDeclAs<CXXMethodDecl>(MethodId);<o:p></o:p></p>
<p class="MsoNormal"> assert(M && "Bad Callback. No node provided");<o:p></o:p></p>
<p class="MsoNormal"><o:p></o:p></p>
<p class="MsoNormal">+ // Check that the method declaration in the main file<o:p></o:p></p>
<p class="MsoNormal">+ if (!SM.isFromMainFile(M->getLocStart()))<o:p></o:p></p>
<p class="MsoNormal">+ return;<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal"> // First check that there isn't already an override attribute.<o:p></o:p></p>
<p class="MsoNormal"> if (!M->hasAttr<OverrideAttr>()) {<o:p></o:p></p>
<p class="MsoNormal"> if (M->getLocStart().isFileID()) {<o:p></o:p></p>
<p class="MsoNormal"> SourceLocation StartLoc;<o:p></o:p></p>
<p class="MsoNormal"> if (M->hasInlineBody()) {<o:p></o:p></p>
</div>
</body>
</html>