From 73223fe5c35e82e1dfcf21ecf64bf77965cde900 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 10 May 2016 11:05:42 +0900 Subject: [PATCH] Upgrade to Node v6 --- atom/common/api/atom_api_native_image.cc | 2 +- atom/common/node_includes.h | 1 + atom/renderer/node_array_buffer_bridge.cc | 2 +- vendor/node | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index e440f9c..97cc674 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -63,7 +63,7 @@ float GetScaleFactorFromPath(const base::FilePath& path) { // We don't try to convert string to float here because it is very very // expensive. - for (unsigned i = 0; i < arraysize(kScaleFactorPairs); ++i) { + for (unsigned i = 0; i < node::arraysize(kScaleFactorPairs); ++i) { if (base::EndsWith(filename, kScaleFactorPairs[i].name, base::CompareCase::INSENSITIVE_ASCII)) return kScaleFactorPairs[i].scale; diff --git a/atom/common/node_includes.h b/atom/common/node_includes.h index bb76afb..3734a43 100644 --- a/atom/common/node_includes.h +++ b/atom/common/node_includes.h @@ -21,6 +21,7 @@ #undef CHECK_LT #undef DISALLOW_COPY_AND_ASSIGN #undef NO_RETURN +#undef arraysize #undef debug_string // This is defined in OS X 10.9 SDK in AssertMacros.h. #include "vendor/node/src/env.h" #include "vendor/node/src/env-inl.h" diff --git a/atom/renderer/node_array_buffer_bridge.cc b/atom/renderer/node_array_buffer_bridge.cc index c4b8d26..61ad252 100644 --- a/atom/renderer/node_array_buffer_bridge.cc +++ b/atom/renderer/node_array_buffer_bridge.cc @@ -53,7 +53,7 @@ v8::Local BlinkUint8ArrayNew( ab, mate::ConvertToV8(isolate, offset), mate::ConvertToV8(isolate, size) }; return v8::Local::Cast(constructor->NewInstance( - context, arraysize(args), args).ToLocalChecked()); + context, node::arraysize(args), args).ToLocalChecked()); } } // namespace diff --git a/vendor/node b/vendor/node index 6bcd8af..7d119e7 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit 6bcd8af891a991f8aa196e49e6bf908ebbe24cae +Subproject commit 7d119e77b9fe893d6e791c88c9e6122957e088ca -- 2.7.4