r198837 - Fix the clang -Werror build after r198818

David Blaikie dblaikie at gmail.com
Wed Jan 8 18:34:06 PST 2014


Author: dblaikie
Date: Wed Jan  8 20:34:06 2014
New Revision: 198837

URL: http://llvm.org/viewvc/llvm-project?rev=198837&view=rev
Log:
Fix the clang -Werror build after r198818

Modified:
    cfe/trunk/lib/AST/RecordLayoutBuilder.cpp

Modified: cfe/trunk/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/RecordLayoutBuilder.cpp?rev=198837&r1=198836&r2=198837&view=diff
==============================================================================
--- cfe/trunk/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/AST/RecordLayoutBuilder.cpp Wed Jan  8 20:34:06 2014
@@ -2490,7 +2490,7 @@ void MicrosoftRecordLayoutBuilder::injec
 }
 
 void MicrosoftRecordLayoutBuilder::injectVPtrs(const CXXRecordDecl *RD) {
-  if (!(HasOwnVFPtr || HasVBPtr && !SharedVBPtrBase))
+  if (!(HasOwnVFPtr || (HasVBPtr && !SharedVBPtrBase)))
     return;
   if (!Is64BitMode || RequiredAlignment <= CharUnits::fromQuantity(8)) {
     // Note that the VBPtr is injected first.  It depends on the alignment of





More information about the cfe-commits mailing list