diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/preparser/preparser-process.cc | |
parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/preparser/preparser-process.cc')
-rw-r--r-- | src/3rdparty/v8/preparser/preparser-process.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/v8/preparser/preparser-process.cc b/src/3rdparty/v8/preparser/preparser-process.cc index 368f63f..1bcc804 100644 --- a/src/3rdparty/v8/preparser/preparser-process.cc +++ b/src/3rdparty/v8/preparser/preparser-process.cc @@ -1,4 +1,4 @@ -// Copyright 2011 the V8 project authors. All rights reserved. +// Copyright 2012 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -202,7 +202,7 @@ void fail(v8::PreParserData* data, const char* message, ...) { fflush(stderr); if (data != NULL) { // Print preparser data to stdout. - uint32_t size = data->size(); + uint32_t size = static_cast<uint32_t>(data->size()); fprintf(stderr, "LOG: data size: %u\n", size); if (!WriteBuffer(stdout, data->data(), size)) { perror("ERROR: Writing data"); @@ -232,7 +232,7 @@ struct ExceptionExpectation { void CheckException(v8::PreParserData* data, ExceptionExpectation* expects) { - PreparseDataInterpreter reader(data->data(), data->size()); + PreparseDataInterpreter reader(data->data(), static_cast<int>(data->size())); if (expects->throws) { if (!reader.throws()) { if (expects->type == NULL) { |