diff options
author | Alon Zakai <alonzakai@gmail.com> | 2016-03-28 18:10:46 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2016-03-28 18:10:46 -0700 |
commit | 5c1d36fb66b5aad63b02ab44433af201d22eebe0 (patch) | |
tree | de469d720c58c07ed1f83e65c3455a2964498830 /src/wasm-binary.h | |
parent | 68e15c423d92dd69138702cc572e503a33b31782 (diff) | |
parent | cefb6b6e05c985524e885af17160b9e146f9b088 (diff) | |
download | binaryen-5c1d36fb66b5aad63b02ab44433af201d22eebe0.tar.gz binaryen-5c1d36fb66b5aad63b02ab44433af201d22eebe0.tar.bz2 binaryen-5c1d36fb66b5aad63b02ab44433af201d22eebe0.zip |
Merge branch 'vs2015_fixes' of https://github.com/juj/binaryen into vs2015_fixes
Conflicts:
src/support/safe_integer.cpp
Diffstat (limited to 'src/wasm-binary.h')
-rw-r--r-- | src/wasm-binary.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wasm-binary.h b/src/wasm-binary.h index 6782eec21..edc904787 100644 --- a/src/wasm-binary.h +++ b/src/wasm-binary.h @@ -43,7 +43,7 @@ struct LEB { bool hasMore(T temp, MiniT byte) { // for signed, we must ensure the last bit has the right sign, as it will zero extend - return isSigned() ? (temp != 0 && int32_t(temp) != -1) || (value >= 0 && (byte & 64)) || (value < 0 && !(byte & 64)): temp; + return isSigned() ? (temp != 0 && int32_t(temp) != -1) || (value >= 0 && (byte & 64)) || (value < 0 && !(byte & 64)): (temp != 0); } void write(std::vector<uint8_t>* out) { |