aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-25 15:25:30 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-25 15:25:32 +0200
commitf66f986a25e1949d78a3b4991434465bc9d7eba3 (patch)
tree8d1107667889fb581280045b7da1c64618798246
parentb50e5fe099b3e9d8ece46b239ce930750df2120e (diff)
parent1e7350486582fafc651d07a43d209d30eaaef1d7 (diff)
downloadbitcoin-f66f986a25e1949d78a3b4991434465bc9d7eba3.tar.xz
Merge pull request #4823
1e73504 Fixing C4146 warning (ENikS)
-rw-r--r--src/script/script.h2
-rw-r--r--src/util.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/script.h b/src/script/script.h
index 4c9ac74b78..4aea439e01 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -304,7 +304,7 @@ private:
// If the input vector's most significant byte is 0x80, remove it from
// the result's msb and return a negative.
if (vch.back() & 0x80)
- return -(result & ~(0x80ULL << (8 * (vch.size() - 1))));
+ return -((int64_t)(result & ~(0x80ULL << (8 * (vch.size() - 1)))));
return result;
}
diff --git a/src/util.cpp b/src/util.cpp
index f387fce8c7..632d0965bf 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -618,7 +618,7 @@ void ShrinkDebugFile()
{
// Restart the file with some of the end
std::vector <char> vch(200000,0);
- fseek(file, -vch.size(), SEEK_END);
+ fseek(file, -((long)vch.size()), SEEK_END);
int nBytes = fread(begin_ptr(vch), 1, vch.size(), file);
fclose(file);