Fix for ICE with 16.1.0 toolchain

google · May 22, 2019 · 32d2611 · 32d2611
1 parent 6fc7bfb
commit 32d2611
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/omaha/main.scons b/omaha/main.scons
@@ -465,8 +465,9 @@ win_env.AppendUnique(
         '/std:c++17',
         '/W4',
         '/Wall',
-        '/WX',      # warnings as errors
-        '/Zo',      # better debugging support for optimized code
+        '/WX',            # warnings as errors
+        '/Zc:twoPhase-',  # avoids an ICE in service/service_main.h with 16.1.0.
+        '/Zo',            # better debugging support for optimized code
 
         #
         # Disable the following level 4 warnings below.

diff --git a/omaha/ui/splash_screen.cc b/omaha/ui/splash_screen.cc
@@ -28,7 +28,6 @@
 #include "omaha/common/lang.h"
 #include "omaha/google_update/resource.h"   // For the IDI_APP
 #include "omaha/goopdate/non_localized_resource.h"
-#include "omaha/ui/scoped_gdi.h"
 #include "omaha/ui/ui.h"
 
 namespace {