diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 19:54:12 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 19:54:12 +0000 |
| commit | 90c5e8612c9fce08cb8f9af4b723c0de6f8c05af (patch) | |
| tree | a1304f82e489e6945849d3e0c68312ef5d67b61e | |
| parent | 247e24728016f366f80bda88a3d4b8d7efd2dafe (diff) | |
| download | chromium_src-90c5e8612c9fce08cb8f9af4b723c0de6f8c05af.zip chromium_src-90c5e8612c9fce08cb8f9af4b723c0de6f8c05af.tar.gz chromium_src-90c5e8612c9fce08cb8f9af4b723c0de6f8c05af.tar.bz2 | |
Disable warning 4355 on Windows builds: "'this' : used in base member initializer list".
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1100 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/message_loop.cc | 1 | ||||
| -rw-r--r-- | build/SConscript.main | 1 | ||||
| -rw-r--r-- | build/internal/essential.vsprops | 2 |
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" |