From 3867c39a48aa93f4fd9baac1af170c31ba66eb43 Mon Sep 17 00:00:00 2001 From: "victorw@chromium.org" Date: Mon, 19 Jul 2010 20:37:35 +0000 Subject: Fix nacl_sandbox_tests dependency: allocator target should be added as dependency only when win_use_allocator_shim is 1. Also fix a typo in allocator_shim.cc R=jvoung@google.com, mbelshe@chromium.org TEST=none BUG=none Review URL: http://codereview.chromium.org/3011011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52947 0039d316-1c4b-4281-b951-d872f2087c98 --- base/allocator/allocator_shim.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/allocator') diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index 39161d4..3935737 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -88,7 +88,7 @@ inline bool call_new_handler(bool nothrow) { } catch (const std::bad_alloc&) { if (!nothrow) throw; - return p; + return true; } #endif // (defined(__GNUC__) && !defined(__EXCEPTIONS)) || (defined(_HAS_EXCEPTIONS) && !_HAS_EXCEPTIONS) } -- cgit v1.1