Commit e0422e54 authored by whesse@chromium.org's avatar whesse@chromium.org

Make VS2005 project files compile without errors: changelist...

Make VS2005 project files compile without errors: changelist http://codereview.chromium.org/6286135/.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6706 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 0fb5a1fd
...@@ -67,7 +67,7 @@ void Bignum::AssignUInt64(uint64_t value) { ...@@ -67,7 +67,7 @@ void Bignum::AssignUInt64(uint64_t value) {
int needed_bigits = kUInt64Size / kBigitSize + 1; int needed_bigits = kUInt64Size / kBigitSize + 1;
EnsureCapacity(needed_bigits); EnsureCapacity(needed_bigits);
for (int i = 0; i < needed_bigits; ++i) { for (int i = 0; i < needed_bigits; ++i) {
bigits_[i] = value & kBigitMask; bigits_[i] = static_cast<Chunk>(value & kBigitMask);
value = value >> kBigitSize; value = value >> kBigitSize;
} }
used_digits_ = needed_bigits; used_digits_ = needed_bigits;
...@@ -266,7 +266,7 @@ void Bignum::MultiplyByUInt32(uint32_t factor) { ...@@ -266,7 +266,7 @@ void Bignum::MultiplyByUInt32(uint32_t factor) {
} }
while (carry != 0) { while (carry != 0) {
EnsureCapacity(used_digits_ + 1); EnsureCapacity(used_digits_ + 1);
bigits_[used_digits_] = carry & kBigitMask; bigits_[used_digits_] = static_cast<Chunk>(carry & kBigitMask);
used_digits_++; used_digits_++;
carry >>= kBigitSize; carry >>= kBigitSize;
} }
...@@ -287,13 +287,13 @@ void Bignum::MultiplyByUInt64(uint64_t factor) { ...@@ -287,13 +287,13 @@ void Bignum::MultiplyByUInt64(uint64_t factor) {
uint64_t product_low = low * bigits_[i]; uint64_t product_low = low * bigits_[i];
uint64_t product_high = high * bigits_[i]; uint64_t product_high = high * bigits_[i];
uint64_t tmp = (carry & kBigitMask) + product_low; uint64_t tmp = (carry & kBigitMask) + product_low;
bigits_[i] = tmp & kBigitMask; bigits_[i] = static_cast<Chunk>(tmp & kBigitMask);
carry = (carry >> kBigitSize) + (tmp >> kBigitSize) + carry = (carry >> kBigitSize) + (tmp >> kBigitSize) +
(product_high << (32 - kBigitSize)); (product_high << (32 - kBigitSize));
} }
while (carry != 0) { while (carry != 0) {
EnsureCapacity(used_digits_ + 1); EnsureCapacity(used_digits_ + 1);
bigits_[used_digits_] = carry & kBigitMask; bigits_[used_digits_] = static_cast<Chunk>(carry & kBigitMask);
used_digits_++; used_digits_++;
carry >>= kBigitSize; carry >>= kBigitSize;
} }
...@@ -748,7 +748,8 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) { ...@@ -748,7 +748,8 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) {
for (int i = 0; i < other.used_digits_; ++i) { for (int i = 0; i < other.used_digits_; ++i) {
DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i]; DoubleChunk product = static_cast<DoubleChunk>(factor) * other.bigits_[i];
DoubleChunk remove = borrow + product; DoubleChunk remove = borrow + product;
Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask); Chunk difference =
bigits_[i + exponent_diff] - static_cast<Chunk>(remove & kBigitMask);
bigits_[i + exponent_diff] = difference & kBigitMask; bigits_[i + exponent_diff] = difference & kBigitMask;
borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) + borrow = static_cast<Chunk>((difference >> (kChunkSize - 1)) +
(remove >> kBigitSize)); (remove >> kBigitSize));
......
...@@ -2285,7 +2285,7 @@ static int Intersect(int i1, int i2, const Vector<HeapEntry*>& dominators) { ...@@ -2285,7 +2285,7 @@ static int Intersect(int i1, int i2, const Vector<HeapEntry*>& dominators) {
// The algorithm is based on the article: // The algorithm is based on the article:
// K. Cooper, T. Harvey and K. Kennedy "A Simple, Fast Dominance Algorithm" // K. Cooper, T. Harvey and K. Kennedy "A Simple, Fast Dominance Algorithm"
// Softw. Pract. Exper. 4 (2001), pp. 110. // Softw. Pract. Exper. 4 (2001), pp. 1-10.
bool HeapSnapshotGenerator::BuildDominatorTree( bool HeapSnapshotGenerator::BuildDominatorTree(
const Vector<HeapEntry*>& entries, const Vector<HeapEntry*>& entries,
Vector<HeapEntry*>* dominators) { Vector<HeapEntry*>* dominators) {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
WarnAsError="true" WarnAsError="true"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4355;4800" DisableSpecificWarnings="4351;4355;4800"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
/> />
<Tool <Tool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment