projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d48cdbf
)
Fix the clang -Werror build after r198818
author
David Blaikie
<dblaikie@gmail.com>
Thu, 9 Jan 2014 02:34:06 +0000
(
02:34
+0000)
committer
David Blaikie
<dblaikie@gmail.com>
Thu, 9 Jan 2014 02:34:06 +0000
(
02:34
+0000)
llvm-svn: 198837
clang/lib/AST/RecordLayoutBuilder.cpp
patch
|
blob
|
history
diff --git
a/clang/lib/AST/RecordLayoutBuilder.cpp
b/clang/lib/AST/RecordLayoutBuilder.cpp
index
5191cb2
..
515088e
100644
(file)
--- a/
clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/
clang/lib/AST/RecordLayoutBuilder.cpp
@@
-2490,7
+2490,7
@@
void MicrosoftRecordLayoutBuilder::injectVFPtr(const CXXRecordDecl *RD) {
}
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