reduce the amount of 'C++ magic' this code depends on :)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49489 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Parse/DeclSpec.h b/include/clang/Parse/DeclSpec.h
index b0efc188ef436b192bad7e997fc37c9ffad9faf2..4de4628950cef4a9ce4407dde63c7714ade39f40 100644 (file)
--- a/include/clang/Parse/DeclSpec.h
+++ b/include/clang/Parse/DeclSpec.h
@@ -670,7 +670,7 @@ public:
 struct FieldDeclarator {
   Declarator D;
   Action::ExprTy *BitfieldSize;
-  FieldDeclarator(DeclSpec &DS) : D(DS, Declarator::MemberContext) {
+  explicit FieldDeclarator(DeclSpec &DS) : D(DS, Declarator::MemberContext) {
     BitfieldSize = 0;
   }
 };

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 1d412482ea90271ca966c0432b373f1d2f000157..804fffb9f13b6050a676da967f31c549abaadd0b 100644 (file)
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -677,7 +677,7 @@ ParseStructDeclaration(DeclSpec &DS,
   }
 
   // Read struct-declarators until we find the semicolon.
-  Fields.push_back(DS);
+  Fields.push_back(FieldDeclarator(DS));
   while (1) {
     FieldDeclarator &DeclaratorInfo = Fields.back();
     
@@ -708,7 +708,7 @@ ParseStructDeclaration(DeclSpec &DS,
     ConsumeToken();
     
     // Parse the next declarator.
-    Fields.push_back(DS);
+    Fields.push_back(FieldDeclarator(DS));
     
     // Attributes are only allowed on the second declarator.
     if (Tok.is(tok::kw___attribute))