r185215 - Fix line endings.
Eli Friedman
eli.friedman at gmail.com
Fri Jun 28 13:48:34 PDT 2013
Author: efriedma
Date: Fri Jun 28 15:48:34 2013
New Revision: 185215
URL: http://llvm.org/viewvc/llvm-project?rev=185215&view=rev
Log:
Fix line endings.
Modified:
cfe/trunk/lib/Sema/SemaDeclCXX.cpp
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=185215&r1=185214&r2=185215&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Fri Jun 28 15:48:34 2013
@@ -1954,26 +1954,26 @@ Sema::ActOnCXXMemberDeclarator(Scope *S,
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)) {
More information about the cfe-commits
mailing list