Browse Source

Merge pull request #6755 from electron/upgrade-clang

Upgrade clang
Cheng Zhao 8 years ago
parent
commit
620847d2fd
3 changed files with 4 additions and 2 deletions
  1. 1 1
      atom/browser/atom_browser_main_parts_mac.mm
  2. 2 0
      common.gypi
  3. 1 1
      script/update-clang.sh

+ 1 - 1
atom/browser/atom_browser_main_parts_mac.mm

@@ -18,7 +18,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
 
   // Set our own application delegate.
   AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init];
-  [NSApp setDelegate:(id<NSFileManagerDelegate>)delegate];
+  [NSApp setDelegate:delegate];
 
   brightray::BrowserMainParts::PreMainMessageLoopStart();
 

+ 2 - 0
common.gypi

@@ -102,6 +102,7 @@
             '-Wno-return-type',
             '-Wno-gnu-folding-constant',
             '-Wno-shift-negative-value',
+            '-Wno-varargs', # https://git.io/v6Olj
           ],
         },
         'conditions': [
@@ -117,6 +118,7 @@
               '-Wno-deprecated-declarations',
               '-Wno-return-type',
               '-Wno-shift-negative-value',
+              '-Wno-varargs', # https://git.io/v6Olj
               # Required when building as shared library.
               '-fPIC',
             ],

+ 1 - 1
script/update-clang.sh

@@ -8,7 +8,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=261368
+CLANG_REVISION=269902
 
 # This is incremented when pushing a new build of Clang at the same revision.
 CLANG_SUB_REVISION=1