diff options
| -rw-r--r-- | include/clang/Rewrite/RewriteRope.h | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/clang/Rewrite/RewriteRope.h b/include/clang/Rewrite/RewriteRope.h index ad7bb735d6..7faa451290 100644 --- a/include/clang/Rewrite/RewriteRope.h +++ b/include/clang/Rewrite/RewriteRope.h @@ -116,7 +116,7 @@ namespace clang { // end iterator RopePieceBTreeIterator() : CurNode(0), CurPiece(0), CurChar(0) {} - const char operator*() const { + char operator*() const { return (*CurPiece)[CurChar]; } diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 09f1179112..5b6bd104a9 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -830,7 +830,7 @@ void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl, || isa<ObjCProtocolDecl>(ClassDecl); bool checkIdenticalMethods = isa<ObjCImplementationDecl>(ClassDecl); - if (pNum != 0) + if (pNum != 0) { if (ObjCInterfaceDecl *IDecl = dyn_cast<ObjCInterfaceDecl>(ClassDecl)) IDecl->addProperties((ObjCPropertyDecl**)allProperties, pNum); else if (ObjCCategoryDecl *CDecl = dyn_cast<ObjCCategoryDecl>(ClassDecl)) @@ -839,6 +839,7 @@ void Sema::ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl, PDecl->addProperties((ObjCPropertyDecl**)allProperties, pNum); else assert(false && "ActOnAtEnd - property declaration misplaced"); + } for (unsigned i = 0; i < allNum; i++ ) { ObjCMethodDecl *Method = |