summaryrefslogtreecommitdiffstats
path: root/clang
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
commitc81a7a2591964967a14bc18775f8fa7240a9a246 (patch)
tree7346a62b2e5ef1f224894b3bbadb3778e9f15aae /clang
parent9bb83e85b8a25dfa60c28c6afb3c598bdd7653f3 (diff)
downloadbcm5719-llvm-c81a7a2591964967a14bc18775f8fa7240a9a246.tar.gz
bcm5719-llvm-c81a7a2591964967a14bc18775f8fa7240a9a246.zip
Rename the type argument for the iboutletcollection attribute to not
conflict with MinGW headers, from Kirk Beitz! llvm-svn: 127127
Diffstat (limited to 'clang')
-rw-r--r--clang/include/clang/Basic/Attr.td2
-rw-r--r--clang/tools/libclang/CIndex.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td
index 282c5082ed6..3579e2c6f13 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/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/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 21251e09b10..74f90790c74 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/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"
OpenPOWER on IntegriCloud