summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2013-06-28 20:48:34 +0000
committerEli Friedman <eli.friedman@gmail.com>2013-06-28 20:48:34 +0000
commitc37dbf7f6534f8e76211694ccc5622b6f342cfde (patch)
tree4653e751142e6acdaa47de885bd5cd16d4962c46 /clang/lib/Sema/SemaDeclCXX.cpp
parent9ce3fedcdd372b75b1baa9cfdc053e796137cd93 (diff)
downloadbcm5719-llvm-c37dbf7f6534f8e76211694ccc5622b6f342cfde.tar.gz
bcm5719-llvm-c37dbf7f6534f8e76211694ccc5622b6f342cfde.zip
Fix line endings.
llvm-svn: 185215
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 45cf57feea9..4a008a0ed3c 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1954,26 +1954,26 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
AttributeList *MSPropertyAttr =
getMSPropertyAttr(D.getDeclSpec().getAttributes().getList());
- if (MSPropertyAttr) {
- Member = HandleMSProperty(S, cast<CXXRecordDecl>(CurContext), Loc, D,
- BitWidth, InitStyle, AS, MSPropertyAttr);
- if (!Member)
- return 0;
- isInstField = false;
- } else {
- Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D,
- BitWidth, InitStyle, AS);
- assert(Member && "HandleField never returns null");
- }
- } else {
- assert(InitStyle == ICIS_NoInit || D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_static);
-
- Member = HandleDeclarator(S, D, TemplateParameterLists);
- if (!Member)
- return 0;
-
- // Non-instance-fields can't have a bitfield.
- if (BitWidth) {
+ if (MSPropertyAttr) {
+ Member = HandleMSProperty(S, cast<CXXRecordDecl>(CurContext), Loc, D,
+ BitWidth, InitStyle, AS, MSPropertyAttr);
+ if (!Member)
+ return 0;
+ isInstField = false;
+ } else {
+ Member = HandleField(S, cast<CXXRecordDecl>(CurContext), Loc, D,
+ BitWidth, InitStyle, AS);
+ assert(Member && "HandleField never returns null");
+ }
+ } else {
+ assert(InitStyle == ICIS_NoInit || D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_static);
+
+ Member = HandleDeclarator(S, D, TemplateParameterLists);
+ if (!Member)
+ return 0;
+
+ // Non-instance-fields can't have a bitfield.
+ if (BitWidth) {
if (Member->isInvalidDecl()) {
// don't emit another diagnostic.
} else if (isa<VarDecl>(Member)) {
OpenPOWER on IntegriCloud