aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-03-06 18:55:32 +0000
committerDouglas Gregor <dgregor@apple.com>2011-03-06 18:55:32 +0000
commit841b238087d6cdb21c2443b7429cb85bd1f9fce2 (patch)
tree5dba7d4264477275b8e9a9d4c87c09dc53cd1bd4
parentc850578dbfa68cf2d2776f59a5cb0009134d970e (diff)
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
-rw-r--r--include/clang/Basic/Attr.td2
-rw-r--r--tools/libclang/CIndex.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 282c5082ed..3579e2c6f1 100644
--- 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 21251e09b1..74f90790c7 100644
--- 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"