diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2014-05-02 13:17:57 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2014-05-02 13:17:57 +0000 |
| commit | 73b3651e9de320746659fe4974dcd88c8e9d1e9b (patch) | |
| tree | 77dc56528a8af49fe91e35cdd95dc5405f3e3aef | |
| parent | 42d262f410357a906d5191027384d9181733c461 (diff) | |
| download | bcm5719-llvm-73b3651e9de320746659fe4974dcd88c8e9d1e9b.tar.gz bcm5719-llvm-73b3651e9de320746659fe4974dcd88c8e9d1e9b.zip | |
Renaming the CallableState variadic attribute argument to be CallableStates. No functional changes intended.
llvm-svn: 207836
| -rw-r--r-- | clang/include/clang/Basic/Attr.td | 2 | ||||
| -rw-r--r-- | clang/lib/Analysis/Consumed.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td index bc16819ac20..3be16d2aba5 100644 --- a/clang/include/clang/Basic/Attr.td +++ b/clang/include/clang/Basic/Attr.td @@ -1568,7 +1568,7 @@ def ConsumableSetOnRead : InheritableAttr { def CallableWhen : InheritableAttr { let Spellings = [GNU<"callable_when">]; let Subjects = SubjectList<[CXXMethod]>; - let Args = [VariadicEnumArgument<"CallableState", "ConsumedState", + let Args = [VariadicEnumArgument<"CallableStates", "ConsumedState", ["unknown", "consumed", "unconsumed"], ["Unknown", "Consumed", "Unconsumed"]>]; let Documentation = [CallableWhenDocs]; diff --git a/clang/lib/Analysis/Consumed.cpp b/clang/lib/Analysis/Consumed.cpp index aac5658d565..e0a9d512c81 100644 --- a/clang/lib/Analysis/Consumed.cpp +++ b/clang/lib/Analysis/Consumed.cpp @@ -113,8 +113,8 @@ static ConsumedState invertConsumedUnconsumed(ConsumedState State) { static bool isCallableInState(const CallableWhenAttr *CWAttr, ConsumedState State) { - CallableWhenAttr::callableState_iterator I = CWAttr->callableState_begin(), - E = CWAttr->callableState_end(); + CallableWhenAttr::callableStates_iterator I = CWAttr->callableStates_begin(), + E = CWAttr->callableStates_end(); for (; I != E; ++I) { |

