From d1c8058f5704fa9f58c738e636858a0c8b32d425 Mon Sep 17 00:00:00 2001
From: "jschuh@chromium.org"
 <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 13 Nov 2013 22:26:36 +0000
Subject: Fix Win64 build errors

TBR=abarth@chromium.org
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/61003006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234931 0039d316-1c4b-4281-b951-d872f2087c98
---
 gin/converter.cc  | 4 ++--
 gin/initialize.cc | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'gin')

diff --git a/gin/converter.cc b/gin/converter.cc
index 8f9d0ab..64f5954 100644
--- a/gin/converter.cc
+++ b/gin/converter.cc
@@ -89,7 +89,7 @@ Handle<Value> Converter<std::string>::ToV8(Isolate* isolate,
   return String::NewFromUtf8(isolate,
                              val.data(),
                              String::kNormalString,
-                             val.length());
+                             static_cast<uint32_t>(val.length()));
 }
 
 bool Converter<std::string>::FromV8(Handle<Value> val,
@@ -129,7 +129,7 @@ v8::Handle<v8::String> StringToSymbol(v8::Isolate* isolate,
   return String::NewFromUtf8(isolate,
                              val.data(),
                              String::kInternalizedString,
-                             val.length());
+                             static_cast<uint32_t>(val.length()));
 }
 
 
diff --git a/gin/initialize.cc b/gin/initialize.cc
index 450ff2a..64b5908 100644
--- a/gin/initialize.cc
+++ b/gin/initialize.cc
@@ -26,7 +26,8 @@ const char kFlags[] = "--use_strict --harmony";
 void Initialize() {
   v8::V8::SetArrayBufferAllocator(ArrayBufferAllocator::SharedInstance());
   v8::V8::InitializeICU();
-  v8::V8::SetFlagsFromString(kFlags, strlen(kFlags));
+  v8::V8::SetFlagsFromString(kFlags,
+      static_cast<uint32_t>(sizeof(kFlags) / sizeof(kFlags[0])) - 1);
   v8::V8::SetEntropySource(&GenerateEntropy);
   v8::V8::Initialize();
 
-- 
cgit v1.1