From 728d8a37f471afaeaa6af19823f9da8c41f1f65a Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 18 Nov 2009 15:25:58 +0100 Subject: Upgrade v8 to 2.0 (With just one change: remove -Werror) --- deps/v8/src/platform-win32.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'deps/v8/src/platform-win32.cc') diff --git a/deps/v8/src/platform-win32.cc b/deps/v8/src/platform-win32.cc index d1f53194fb..1be4b77f8a 100644 --- a/deps/v8/src/platform-win32.cc +++ b/deps/v8/src/platform-win32.cc @@ -839,7 +839,7 @@ void* OS::Allocate(const size_t requested, size_t* allocated, bool is_executable) { // VirtualAlloc rounds allocated size to page size automatically. - size_t msize = RoundUp(requested, GetPageSize()); + size_t msize = RoundUp(requested, static_cast(GetPageSize())); // Windows XP SP2 allows Data Excution Prevention (DEP). int prot = is_executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; @@ -852,7 +852,7 @@ void* OS::Allocate(const size_t requested, ASSERT(IsAligned(reinterpret_cast(mbase), OS::AllocateAlignment())); *allocated = msize; - UpdateAllocatedSpaceLimits(mbase, msize); + UpdateAllocatedSpaceLimits(mbase, static_cast(msize)); return mbase; } @@ -1316,6 +1316,11 @@ int OS::StackWalk(Vector frames) { return 0; } #endif // __MINGW32__ +uint64_t OS::CpuFeaturesImpliedByPlatform() { + return 0; // Windows runs on anything. +} + + double OS::nan_value() { #ifdef _MSC_VER // Positive Quiet NaN with no payload (aka. Indeterminate) has all bits @@ -1361,7 +1366,7 @@ bool VirtualMemory::Commit(void* address, size_t size, bool is_executable) { return false; } - UpdateAllocatedSpaceLimits(address, size); + UpdateAllocatedSpaceLimits(address, static_cast(size)); return true; } @@ -1689,7 +1694,9 @@ bool Win32Socket::Connect(const char* host, const char* port) { } // Connect. - status = connect(socket_, result->ai_addr, result->ai_addrlen); + status = connect(socket_, + result->ai_addr, + static_cast(result->ai_addrlen)); freeaddrinfo(result); return status == 0; } -- cgit v1.2.1