summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/message_loop.cc1
-rw-r--r--build/SConscript.main1
-rw-r--r--build/internal/essential.vsprops2
3 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc
index eb10ca7..caec847 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -78,7 +78,6 @@ static LPTOP_LEVEL_EXCEPTION_FILTER GetTopSEHFilter() {
//------------------------------------------------------------------------------
MessageLoop::MessageLoop()
-#pragma warning(suppress: 4355) // OK, to use |this| in the initializer list.
: timer_manager_(this),
nestable_tasks_allowed_(true),
exception_restoration_(false),
diff --git a/build/SConscript.main b/build/SConscript.main
index 14b8035..7965985 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -212,6 +212,7 @@ if env['PLATFORM'] == 'win32':
'/errorReport:prompt',
+ '/wd4355',
'/wd4503',
'/wd4819',
],
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops
index d7c725b..341c7b2 100644
--- a/build/internal/essential.vsprops
+++ b/build/internal/essential.vsprops
@@ -19,7 +19,7 @@
WarningLevel="3"
WarnAsError="true"
DebugInformationFormat="3"
- DisableSpecificWarnings="4503; 4819"
+ DisableSpecificWarnings="4355; 4503; 4819"
/>
<Tool
Name="VCLibrarianTool"