base/atomicops.h - Issue 10696193: Have iOS use the same atomicops_internal implementation that Mac uses.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/atomicops.h

Issue 10696193: Have iOS use the same atomicops_internal implementation that Mac uses. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 5 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

Index: base/atomicops.h

diff --git a/base/atomicops.h b/base/atomicops.h

index a88fdff93541fe99065fbe9ba47f389bd2626f21..058fc814db7692439ea4f871d8f27d73425e2961 100644

--- a/base/atomicops.h

+++ b/base/atomicops.h

@@ -130,8 +130,10 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);

// Include our platform specific implementation.

#if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY)

#include "base/atomicops_internals_x86_msvc.h"

-#elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY)

-#include "base/atomicops_internals_x86_macosx.h"

+#elif defined(OS_MACOSX)

+// Even though iOS on devices is ARM, the x86 impl uses the Mac OS X calls

+// so it is arch independent (And PPC isn't supported for desktop builds).

stuartmorgan 2012/07/12 12:39:58 Remove this whole comment; it no longer applies.

leng 2012/07/12 12:51:37 Done.

+#include "base/atomicops_internals_mac.h"

#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)

#include "base/atomicops_internals_x86_gcc.h"

#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY)

« no previous file with comments | « no previous file | base/atomicops_internals_mac.h » ('j') | no next file with comments »