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

chore: node_includes header no longer needs to be at the end of the list (#17090)

Browse source 
Until one of the latest version of node, the definition of the DISALLOW_COPY_AND_ASSIGN macro in node was different than in chromium. That is no longer the case, so just undefining the macro in node_includes.h works.
This commit is contained in:
Nitish Sakhawalkar 2019-03-11 17:13:43 -07:00 • committed by Samuel Attard
parent f943db7ad5
commit e77d065875
51 changed files with 52 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/javascript_environment.cc
View file

@ -7,6 +7,7 @@
#include <string>
#include "atom/browser/microtasks_runner.h"
#include "atom/common/node_includes.h"
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "base/task/task_scheduler/initialization_util.h"
@ -14,8 +15,6 @@
#include "content/public/common/content_switches.h"
#include "gin/array_buffer.h"
#include "gin/v8_initializer.h"
#include "atom/common/node_includes.h"
#include "tracing/trace_event.h"
namespace atom {