diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-06-06 20:45:41 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-06-06 20:45:41 +0000 |
| commit | 581deb3da481053c4993c7600f97acf7768caac5 (patch) | |
| tree | 9c3cfe3a1f156e2ac3d7edc4d1a5fdaed4589c1a /lib/Sema/SemaDecl.cpp | |
| parent | 1ada2a65833266c139010bedfad87e58e5a7d74d (diff) | |
Revert Decl's iterators back to pointer value_type rather than reference value_type
In addition, I've made the pointer and reference typedef 'void' rather than T*
just so they can't get misused. I would've omitted them entirely but
std::distance likes them to be there even if it doesn't use them.
This rolls back r155808 and r155869.
Review by Doug Gregor incorporating feedback from Chandler Carruth.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158104 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index ec1f460f53..8d4ce2873b 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -7443,7 +7443,7 @@ Decl *Sema::ActOnStartOfFunctionDef(Scope *FnBodyScope, Decl *D) { if (EnumDecl *ED = dyn_cast<EnumDecl>(D)) { for (EnumDecl::enumerator_iterator EI = ED->enumerator_begin(), EE = ED->enumerator_end(); EI != EE; ++EI) - PushOnScopeChains(&*EI, FnBodyScope, /*AddToContext=*/false); + PushOnScopeChains(*EI, FnBodyScope, /*AddToContext=*/false); } } } @@ -9271,7 +9271,7 @@ void Sema::DiagnoseNontrivial(const RecordType* T, CXXSpecialMember member) { if (RD->hasUserDeclaredConstructor()) { typedef CXXRecordDecl::ctor_iterator ctor_iter; for (ctor_iter CI = RD->ctor_begin(), CE = RD->ctor_end(); CI != CE; ++CI) - if (DiagnoseNontrivialUserProvidedCtor(*this, QT, &*CI, member)) + if (DiagnoseNontrivialUserProvidedCtor(*this, QT, *CI, member)) return; // No user-provided constructors; look for constructor templates. |