projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1cd05bb
)
Fix another conditional expression mismatched enum type warning.
author
Matt Beaumont-Gay
<matthewbg@google.com>
Wed, 22 Dec 2010 18:25:55 +0000
(18:25 +0000)
committer
Matt Beaumont-Gay
<matthewbg@google.com>
Wed, 22 Dec 2010 18:25:55 +0000
(18:25 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122419
91177308
-0d34-0410-b5e6-
96231b3b80d8
lib/MC/MachObjectWriter.cpp
patch
|
blob
|
history
diff --git
a/lib/MC/MachObjectWriter.cpp
b/lib/MC/MachObjectWriter.cpp
index cab64521afb189c76f16aa6c9cd4bf380bce4179..1347427741c83b2e51b49de93e93e9ff183ec8bf 100644
(file)
--- a/
lib/MC/MachObjectWriter.cpp
+++ b/
lib/MC/MachObjectWriter.cpp
@@
-1007,7
+1007,8
@@
public:
FixedValue -= getSectionAddress(Fragment->getParent());
// Determine the appropriate type based on the fixup kind.
- Type = Is24BitBranch ? macho::RIT_ARM_Branch24Bit : macho::RIT_Vanilla;
+ Type = Is24BitBranch ? (unsigned)macho::RIT_ARM_Branch24Bit :
+ (unsigned)macho::RIT_Vanilla;
}
// struct relocation_info (8 bytes)