diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-21 12:02:15 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-21 12:02:15 -0700 |
| commit | 1e9dd32803afed8db333a02aeca000c9ededf2cb (patch) | |
| tree | 715e14106d91f41c7022c8aa7a8fbcb997fbdec9 /src/core/support/cpu_iphone.c | |
| parent | e13bfc0139b4ddb560ee3a0e085dbf518a5dabe5 (diff) | |
| parent | 3c807eac69acd711620aaf7ab44fd79ce406b35e (diff) | |
Merge branch 'master' into node_method_name_conflicts
Diffstat (limited to 'src/core/support/cpu_iphone.c')
| -rw-r--r-- | src/core/support/cpu_iphone.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/support/cpu_iphone.c b/src/core/support/cpu_iphone.c index d412a6d7ee..82b49b47bc 100644 --- a/src/core/support/cpu_iphone.c +++ b/src/core/support/cpu_iphone.c @@ -36,9 +36,7 @@ #ifdef GPR_CPU_IPHONE /* Probably 2 instead of 1, but see comment on gpr_cpu_current_cpu. */ -unsigned gpr_cpu_num_cores(void) { - return 1; -} +unsigned gpr_cpu_num_cores(void) { return 1; } /* Most code that's using this is using it to shard across work queues. So unless profiling shows it's a problem or there appears a way to detect the @@ -46,8 +44,6 @@ unsigned gpr_cpu_num_cores(void) { Note that the interface in cpu.h lets gpr_cpu_num_cores return 0, but doing it makes it impossible for gpr_cpu_current_cpu to satisfy its stated range, and some code might be relying on it. */ -unsigned gpr_cpu_current_cpu(void) { - return 0; -} +unsigned gpr_cpu_current_cpu(void) { return 0; } #endif /* GPR_CPU_IPHONE */ |