Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Unified Diff: base/allocator/allocator_shim_internals.h

Issue 1875173002: Reland of Enable allocator shim for Android (https://codereview.chromium.org/1875043003/) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for LLVM libc++ Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/README.md ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator_shim_internals.h
diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internals.h
index 35df284b89ad1af9f55c226950c22a5170eca472..fc3624c596bd3980cd00755cf26ed1cd29d893b4 100644
--- a/base/allocator/allocator_shim_internals.h
+++ b/base/allocator/allocator_shim_internals.h
@@ -9,8 +9,12 @@
#include <sys/cdefs.h> // for __THROW
-#ifndef __THROW /* Not a glibc system */
+#ifndef __THROW // Not a glibc system
+#ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
+#define __THROW _NOEXCEPT
+#else
#define __THROW
+#endif // !_NOEXCEPT
#endif
// Shim layer symbols need to be ALWAYS exported, regardless of component build.
« no previous file with comments | « base/allocator/README.md ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698