diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-01-23 11:10:26 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-01-23 11:10:26 +0000 |
| commit | 2fce988e86bc01829142e4362d4eff1af0925147 (patch) | |
| tree | c69d3f4f13d508570bb5257a6aea735f88bdf09c /lib/Sema/SemaInit.h | |
| parent | a3fa5c7f1b5e2ba4d6ec033dc0e2376326b05824 (diff) | |
| download | FreeBSD-src-2fce988e86bc01829142e4362d4eff1af0925147.zip FreeBSD-src-2fce988e86bc01829142e4362d4eff1af0925147.tar.gz | |
Update clang to r94309.
Diffstat (limited to 'lib/Sema/SemaInit.h')
| -rw-r--r-- | lib/Sema/SemaInit.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/Sema/SemaInit.h b/lib/Sema/SemaInit.h index 5eb819a..d7d3756 100644 --- a/lib/Sema/SemaInit.h +++ b/lib/Sema/SemaInit.h @@ -47,6 +47,11 @@ public: /// \brief The entity being initialized is an exception object that /// is being thrown. EK_Exception, + /// \brief The entity being initialized is a non-static data member + /// subobject. + EK_Member, + /// \brief The entity being initialized is an element of an array. + EK_ArrayElement, /// \brief The entity being initialized is an object (or array of /// objects) allocated via new. EK_New, @@ -54,12 +59,10 @@ public: EK_Temporary, /// \brief The entity being initialized is a base member subobject. EK_Base, - /// \brief The entity being initialized is a non-static data member - /// subobject. - EK_Member, - /// \brief The entity being initialized is an element of an array + /// \brief The entity being initialized is an element of a vector. /// or vector. - EK_ArrayOrVectorElement + EK_VectorElement + }; private: @@ -211,7 +214,7 @@ public: /// \brief If this is already the initializer for an array or vector /// element, sets the element index. void setElementIndex(unsigned Index) { - assert(getKind() == EK_ArrayOrVectorElement); + assert(getKind() == EK_ArrayElement || getKind() == EK_VectorElement); this->Index = Index; } }; |
