Commit 37c1c061 authored by yangguo@chromium.org's avatar yangguo@chromium.org

Fix more windows build warnings.

TBR=ulan@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/10917065

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12433 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent f653480a
...@@ -4961,7 +4961,8 @@ Local<String> v8::String::NewExternal(ExternalLatin1StringResource* resource, ...@@ -4961,7 +4961,8 @@ Local<String> v8::String::NewExternal(ExternalLatin1StringResource* resource,
// since it's not. Instead, we convert it to an internal string and dispose // since it's not. Instead, we convert it to an internal string and dispose
// the external resource. // the external resource.
result = isolate->factory()->NewStringFromLatin1( result = isolate->factory()->NewStringFromLatin1(
i::Vector<const char>(resource->data(), resource->length()), i::Vector<const char>(resource->data(),
static_cast<int>(resource->length())),
i::NOT_TENURED, i::NOT_TENURED,
i::String::NOT_ASCII); i::String::NOT_ASCII);
resource->Dispose(); resource->Dispose();
......
...@@ -717,10 +717,10 @@ TEST(ExternalStringWithDisposeHandling) { ...@@ -717,10 +717,10 @@ TEST(ExternalStringWithDisposeHandling) {
static void TestNewLatin1String(int encoding1, int encoding2) { static void TestNewLatin1String(int encoding1, int encoding2) {
const char* chars1 = "ASCII 123"; const char* chars1 = "ASCII 123";
const char* chars1js = "'ASCII 123'"; const char* chars1js = "'ASCII 123'";
int str1_len = strlen(chars1); int str1_len = static_cast<int>(strlen(chars1));
const char* chars2 = "Non-ASCII \xAB\xCD\xEF"; const char* chars2 = "Non-ASCII \xAB\xCD\xEF";
const char* chars2js = "'Non-ASCII \\u00ab\\u00cd\\u00ef'"; const char* chars2js = "'Non-ASCII \\u00ab\\u00cd\\u00ef'";
int str2_len = strlen(chars2); int str2_len = static_cast<int>(strlen(chars2));
Local<String> str1 = String::New(chars1, str1_len, encoding1); Local<String> str1 = String::New(chars1, str1_len, encoding1);
Local<String> str2 = String::New(chars2, str2_len, encoding2); Local<String> str2 = String::New(chars2, str2_len, encoding2);
...@@ -826,17 +826,21 @@ TEST(WriteLatin1String) { ...@@ -826,17 +826,21 @@ TEST(WriteLatin1String) {
CHECK(v8::Utils::OpenHandle(*sub_string)->IsSlicedString()); CHECK(v8::Utils::OpenHandle(*sub_string)->IsSlicedString());
char buffer[64]; char buffer[64];
CHECK_EQ(strlen(latin1_ascii), latin1_ascii_string->WriteLatin1(buffer)); CHECK_EQ(static_cast<int>(strlen(latin1_ascii)),
latin1_ascii_string->WriteLatin1(buffer));
CHECK_EQ(0, strcmp(latin1_ascii, buffer)); CHECK_EQ(0, strcmp(latin1_ascii, buffer));
CHECK_EQ(strlen(latin1), latin1_string->WriteLatin1(buffer)); CHECK_EQ(static_cast<int>(strlen(latin1)),
latin1_string->WriteLatin1(buffer));
CHECK_EQ(0, strcmp(latin1, buffer)); CHECK_EQ(0, strcmp(latin1, buffer));
CHECK_EQ(strlen(concat), concat_string->WriteLatin1(buffer)); CHECK_EQ(static_cast<int>(strlen(concat)),
concat_string->WriteLatin1(buffer));
CHECK_EQ(0, strcmp(concat, buffer)); CHECK_EQ(0, strcmp(concat, buffer));
CHECK_EQ(strlen(sub), sub_string->WriteLatin1(buffer)); CHECK_EQ(static_cast<int>(strlen(sub)),
sub_string->WriteLatin1(buffer));
CHECK_EQ(0, strcmp(sub, buffer)); CHECK_EQ(0, strcmp(sub, buffer));
memset(buffer, 0x1, sizeof(buffer)); memset(buffer, 0x1, sizeof(buffer));
CHECK_EQ(strlen(latin1), CHECK_EQ(static_cast<int>(strlen(latin1)),
latin1_string->WriteLatin1(buffer, latin1_string->WriteLatin1(buffer,
0, 0,
String::kUndefinedLength, String::kUndefinedLength,
...@@ -846,7 +850,7 @@ TEST(WriteLatin1String) { ...@@ -846,7 +850,7 @@ TEST(WriteLatin1String) {
buffer[strlen(latin1)] = '\0'; buffer[strlen(latin1)] = '\0';
CHECK_EQ(0, strcmp(latin1, buffer)); CHECK_EQ(0, strcmp(latin1, buffer));
CHECK_EQ(strlen(latin1) - 2, CHECK_EQ(static_cast<int>(strlen(latin1)) - 2,
latin1_string->WriteLatin1(buffer, 2)); latin1_string->WriteLatin1(buffer, 2));
CHECK_EQ(0, strncmp(latin1 + 2, buffer, strlen(latin1))); CHECK_EQ(0, strncmp(latin1 + 2, buffer, strlen(latin1)));
} }
......
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