Rename the type argument for the iboutletcollection attribute to not

conflict with MinGW headers, from Kirk Beitz!

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

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 282c5082ed6511acef07bf40168184faed3f13c9..3579e2c6f13d110c924b5d92094c0f09a4b99429 100644 (file)
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -266,7 +266,7 @@ def IBOutlet : InheritableAttr {
 
 def IBOutletCollection : InheritableAttr {
   let Spellings = ["iboutletcollection"];
-  let Args = [TypeArgument<"Interface">];
+  let Args = [TypeArgument<"InterFace">];
 }
 
 def Malloc : InheritableAttr {

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 21251e09b10a4f9c41ca70cc38841090cfc755f2..74f90790c748fa590a6aaf178f55ab5bbc580977 100644 (file)
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -4916,7 +4916,7 @@ CXType clang_getIBOutletCollectionType(CXCursor C) {
   IBOutletCollectionAttr *A =
     cast<IBOutletCollectionAttr>(cxcursor::getCursorAttr(C));
   
-  return cxtype::MakeCXType(A->getInterface(), cxcursor::getCursorTU(C));  
+  return cxtype::MakeCXType(A->getInterFace(), cxcursor::getCursorTU(C));  
 }
 } // end: extern "C"