Fix compilation warnings caused by chrome44 update
authorCheng Zhao <zcbenz@gmail.com>
Tue, 11 Aug 2015 02:08:34 +0000 (10:08 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 11 Aug 2015 02:08:34 +0000 (10:08 +0800)
atom/app/node_main.cc
vendor/brightray

index fe4f3fc..8823e58 100644 (file)
@@ -5,11 +5,12 @@
 #include "atom/app/node_main.h"
 
 #include "atom/browser/javascript_environment.h"
-#include "atom/common/node_includes.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
 
+#include "atom/common/node_includes.h"
+
 namespace atom {
 
 int NodeMain(int argc, char *argv[]) {
index 3f4895f..618311b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3f4895f3fd7cb2ec415b259c2808005512dec57f
+Subproject commit 618311bc70531ae51b7e2daf65d9c6fc01bf0582