<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Feb 20, 2013 at 5:29 PM, Ted Kremenek <span dir="ltr"><<a href="mailto:kremenek@apple.com" target="_blank">kremenek@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kremenek<br>
Date: Wed Feb 20 19:29:01 2013<br>
New Revision: 175701<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=175701&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=175701&view=rev</a><br>
Log:<br>
Strip 'llvm' from 'llvm::Optional' uses.<br></blockquote><div><br></div><div style>Thanks Ted - I often miss tools when I do these things (sed over *.h/*.cpp in include/lib is my usual approach & I forget tools).<br>
<br>- David</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    cfe/trunk/tools/libclang/CIndex.cpp<br>
    cfe/trunk/tools/libclang/CursorVisitor.h<br>
    cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=175701&r1=175700&r2=175701&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=175701&r1=175700&r2=175701&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Wed Feb 20 19:29:01 2013<br>
@@ -557,16 +557,16 @@ bool CursorVisitor::VisitBlockDecl(Block<br>
   return false;<br>
 }<br>
<br>
-llvm::Optional<bool> CursorVisitor::shouldVisitCursor(CXCursor Cursor) {<br>
+Optional<bool> CursorVisitor::shouldVisitCursor(CXCursor Cursor) {<br>
   if (RegionOfInterest.isValid()) {<br>
     SourceRange Range = getFullCursorExtent(Cursor, AU->getSourceManager());<br>
     if (Range.isInvalid())<br>
-      return llvm::Optional<bool>();<br>
+      return Optional<bool>();<br>
<br>
     switch (CompareRegionOfInterest(Range)) {<br>
     case RangeBefore:<br>
       // This declaration comes before the region of interest; skip it.<br>
-      return llvm::Optional<bool>();<br>
+      return Optional<bool>();<br>
<br>
     case RangeAfter:<br>
       // This declaration comes after the region of interest; we're done.<br>
@@ -617,7 +617,7 @@ bool CursorVisitor::VisitDeclContext(Dec<br>
         Cursor = MakeCursorObjCProtocolRef(PD, PD->getLocation(), TU);<br>
     }<br>
<br>
-    const llvm::Optional<bool> &V = shouldVisitCursor(Cursor);<br>
+    const Optional<bool> &V = shouldVisitCursor(Cursor);<br>
     if (!V.hasValue())<br>
       continue;<br>
     if (!V.getValue())<br>
@@ -981,7 +981,7 @@ bool CursorVisitor::VisitObjCContainerDe<br>
   for (SmallVectorImpl<Decl*>::iterator I = DeclsInContainer.begin(),<br>
          E = DeclsInContainer.end(); I != E; ++I) {<br>
     CXCursor Cursor = MakeCXCursor(*I, TU, RegionOfInterest);<br>
-    const llvm::Optional<bool> &V = shouldVisitCursor(Cursor);<br>
+    const Optional<bool> &V = shouldVisitCursor(Cursor);<br>
     if (!V.hasValue())<br>
       continue;<br>
     if (!V.getValue())<br>
@@ -5741,12 +5741,12 @@ static CXVersion convertVersion(VersionT<br>
<br>
   Out.Major = In.getMajor();<br>
<br>
-  if (llvm::Optional<unsigned> Minor = In.getMinor())<br>
+  if (Optional<unsigned> Minor = In.getMinor())<br>
     Out.Minor = *Minor;<br>
   else<br>
     return Out;<br>
<br>
-  if (llvm::Optional<unsigned> Subminor = In.getSubminor())<br>
+  if (Optional<unsigned> Subminor = In.getSubminor())<br>
     Out.Subminor = *Subminor;<br>
<br>
   return Out;<br>
<br>
Modified: cfe/trunk/tools/libclang/CursorVisitor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CursorVisitor.h?rev=175701&r1=175700&r2=175701&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CursorVisitor.h?rev=175701&r1=175700&r2=175701&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/tools/libclang/CursorVisitor.h (original)<br>
+++ cfe/trunk/tools/libclang/CursorVisitor.h Wed Feb 20 19:29:01 2013<br>
@@ -199,7 +199,7 @@ public:<br>
   bool VisitAttributes(Decl *D);<br>
   bool VisitBlockDecl(BlockDecl *B);<br>
   bool VisitCXXRecordDecl(CXXRecordDecl *D);<br>
-  llvm::Optional<bool> shouldVisitCursor(CXCursor C);<br>
+  Optional<bool> shouldVisitCursor(CXCursor C);<br>
   bool VisitDeclContext(DeclContext *DC);<br>
   bool VisitTranslationUnitDecl(TranslationUnitDecl *D);<br>
   bool VisitTypedefDecl(TypedefDecl *D);<br>
<br>
Modified: cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp?rev=175701&r1=175700&r2=175701&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp?rev=175701&r1=175700&r2=175701&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp (original)<br>
+++ cfe/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp Wed Feb 20 19:29:01 2013<br>
@@ -291,7 +291,7 @@ typedef llvm::PointerUnion<RecordVec*, R<br>
 namespace {<br>
 class InferPedantic {<br>
   typedef llvm::DenseMap<const Record*,<br>
-                         std::pair<unsigned, llvm::Optional<unsigned> > > GMap;<br>
+                         std::pair<unsigned, Optional<unsigned> > > GMap;<br>
<br>
   DiagGroupParentMap &DiagGroupParents;<br>
   const std::vector<Record*> &Diags;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>