summaryrefslogtreecommitdiff
path: root/deps/v8/tools/shell-utils.h
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2015-06-19 13:23:56 +0200
committerRod Vagg <rod@vagg.org>2015-08-04 11:56:14 -0700
commit70d1f32f5605465a1a630a64f6f0d35f96c7709d (patch)
tree0a349040a686eafcb0a09943ebc733477dce2781 /deps/v8/tools/shell-utils.h
parent4643b8b6671607a7aff60cbbd0b384dcf2f6959e (diff)
downloadnode-new-70d1f32f5605465a1a630a64f6f0d35f96c7709d.tar.gz
deps: update v8 to 4.4.63.9
Upgrade the bundled V8 and update code in src/ and lib/ to the new API. Notable backwards incompatible changes are the removal of the smalloc module and dropped support for CESU-8 decoding. CESU-8 support can be brought back if necessary by doing UTF-8 decoding ourselves. This commit includes https://codereview.chromium.org/1192973004 to fix a build error on python 2.6 systems. The original commit log follows: Use optparse in js2c.py for python compatibility Without this change, V8 won't build on RHEL/CentOS 6 because the distro python is too old to know about the argparse module. PR-URL: https://github.com/nodejs/io.js/pull/2022 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/v8/tools/shell-utils.h')
-rw-r--r--deps/v8/tools/shell-utils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/deps/v8/tools/shell-utils.h b/deps/v8/tools/shell-utils.h
index 7b51d2f5b0..31bd8ea8f6 100644
--- a/deps/v8/tools/shell-utils.h
+++ b/deps/v8/tools/shell-utils.h
@@ -27,6 +27,8 @@
// Utility functions used by parser-shell.
+#include "src/globals.h"
+
#include <stdio.h>
namespace v8 {
@@ -44,7 +46,7 @@ const byte* ReadFileAndRepeat(const char* name, int* size, int repeat) {
if (file == NULL) return NULL;
fseek(file, 0, SEEK_END);
- int file_size = ftell(file);
+ int file_size = static_cast<int>(ftell(file));
rewind(file);
*size = file_size * repeat;