diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 00:01:53 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 00:01:53 +0000 |
| commit | 5a3c1f066555b8aa18132bc0f03d13b5f7413357 (patch) | |
| tree | 5df1604b4bdfa6701e6439b00d813d71f0d73674 /base/allocator/allocator_unittest.cc | |
| parent | 13a2b92fc3474d3a66f77051cfb75eb57cf6cfaa (diff) | |
| download | chromium_src-5a3c1f066555b8aa18132bc0f03d13b5f7413357.zip chromium_src-5a3c1f066555b8aa18132bc0f03d13b5f7413357.tar.gz chromium_src-5a3c1f066555b8aa18132bc0f03d13b5f7413357.tar.bz2 | |
Re-enable various MSVC warnings.
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/415773009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator/allocator_unittest.cc')
| -rw-r--r-- | base/allocator/allocator_unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/base/allocator/allocator_unittest.cc b/base/allocator/allocator_unittest.cc index eb20b38..a39b838 100644 --- a/base/allocator/allocator_unittest.cc +++ b/base/allocator/allocator_unittest.cc @@ -287,6 +287,13 @@ static void TestCalloc(size_t n, size_t s, bool ok) { } } +// MSVC C4530 complains about exception handler usage when exceptions are +// disabled. Temporarily disable that warning so we can test that they are, in +// fact, disabled. +#if defined(OS_WIN) +#pragma warning(push) +#pragma warning(disable: 4530) +#endif // A global test counter for number of times the NewHandler is called. static int news_handled = 0; @@ -331,6 +338,10 @@ static void TestNothrowNew(void* (*func)(size_t)) { std::set_new_handler(saved_handler); } +#if defined(OS_WIN) +#pragma warning(pop) +#endif + } // namespace //----------------------------------------------------------------------------- |