mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix build error after rebasing

Browse source
This commit is contained in:
Cheng Zhao 2018-01-31 16:09:13 +09:00
parent 9d05c59600
commit 39e0433570
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_in_app_purchase.cc
View file

@ -112,4 +112,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace } // namespace
NODE_MODULE_CONTEXT_AWARE_BUILTIN(atom_browser_in_app_purchase, Initialize) NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)

8
atom/common/node_bindings.cc
View file

@ -192,18 +192,14 @@ void NodeBindings::Initialize() {
} }
node::Environment* NodeBindings::CreateEnvironment( node::Environment* NodeBindings::CreateEnvironment(
<<<<<<< c1acc6cb5c9591122cecfcf3910c73d62d28eaf7 v8::Handle<v8::Context> context,
v8::Handle<v8::Context> context) { node::MultiIsolatePlatform* platform) {
#if defined(OS_WIN) #if defined(OS_WIN)
auto& atom_args = AtomCommandLine::argv(); auto& atom_args = AtomCommandLine::argv();
std::vector<std::string> args(atom_args.size()); std::vector<std::string> args(atom_args.size());
std::transform(atom_args.cbegin(), atom_args.cend(), args.begin(), std::transform(atom_args.cbegin(), atom_args.cend(), args.begin(),
[](auto& a) { return base::WideToUTF8(a); }); [](auto& a) { return base::WideToUTF8(a); });
#else #else
=======
v8::Handle<v8::Context> context,
node::MultiIsolatePlatform* platform) {
>>>>>>> Upgrade to node v9.3.0 (#11507)
auto args = AtomCommandLine::argv(); auto args = AtomCommandLine::argv();
#endif #endif