r207836 - Renaming the CallableState variadic attribute argument to be CallableStates. No functional changes intended.

[Aaron Ballman]

Author: aaronballman
Date: Fri May  2 08:17:57 2014
New Revision: 207836

URL: http://llvm.org/viewvc/llvm-project?rev=207836&view=rev
Log:
Renaming the CallableState variadic attribute argument to be CallableStates. No functional changes intended.

Modified:
    cfe/trunk/include/clang/Basic/Attr.td
    cfe/trunk/lib/Analysis/Consumed.cpp

Modified: cfe/trunk/include/clang/Basic/Attr.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=207836&r1=207835&r2=207836&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Attr.td (original)
+++ cfe/trunk/include/clang/Basic/Attr.td Fri May  2 08:17:57 2014
@@ -1568,7 +1568,7 @@ def ConsumableSetOnRead : InheritableAtt
 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];

Modified: cfe/trunk/lib/Analysis/Consumed.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/Consumed.cpp?rev=207836&r1=207835&r2=207836&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/Consumed.cpp (original)
+++ cfe/trunk/lib/Analysis/Consumed.cpp Fri May  2 08:17:57 2014
@@ -113,8 +113,8 @@ static ConsumedState invertConsumedUncon
 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) {