diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-01-16 23:06:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-16 23:06:13 -0800 |
| commit | 9c947b14fcaae1233b58c2c3ab3351b632dba76b (patch) | |
| tree | 1fc075667077785154ca56e34342040a406dac8e | |
| parent | cb7e217fb0a6c024abaa0f233edfd7d99aacc64d (diff) | |
| parent | 56750efd3a5fffaef6306df89fc9a2054d5e5861 (diff) | |
| download | android_dalvik-9c947b14fcaae1233b58c2c3ab3351b632dba76b.tar.gz android_dalvik-9c947b14fcaae1233b58c2c3ab3351b632dba76b.tar.bz2 android_dalvik-9c947b14fcaae1233b58c2c3ab3351b632dba76b.zip | |
am 56750efd: am 0f403d5f: Remove some inline declarations to improve debugging.
* commit '56750efd3a5fffaef6306df89fc9a2054d5e5861':
Remove some inline declarations to improve debugging.
| -rw-r--r-- | vm/alloc/HeapSource.c | 6 | ||||
| -rw-r--r-- | vm/alloc/MarkSweep.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vm/alloc/HeapSource.c b/vm/alloc/HeapSource.c index d2d6daf00..06ebb68bc 100644 --- a/vm/alloc/HeapSource.c +++ b/vm/alloc/HeapSource.c @@ -201,8 +201,7 @@ getAllocLimit(const HeapSource *hs) * Returns the current footprint of all heaps. If includeActive * is false, don't count the heap at index 0. */ -static inline size_t -oldHeapOverhead(const HeapSource *hs, bool includeActive) +static size_t oldHeapOverhead(const HeapSource *hs, bool includeActive) { size_t footprint = 0; size_t i; @@ -223,8 +222,7 @@ oldHeapOverhead(const HeapSource *hs, bool includeActive) * Returns the heap that <ptr> could have come from, or NULL * if it could not have come from any heap. */ -static inline Heap * -ptr2heap(const HeapSource *hs, const void *ptr) +static Heap *ptr2heap(const HeapSource *hs, const void *ptr) { const size_t numHeaps = hs->numHeaps; size_t i; diff --git a/vm/alloc/MarkSweep.c b/vm/alloc/MarkSweep.c index 5ea34587f..37fc22387 100644 --- a/vm/alloc/MarkSweep.c +++ b/vm/alloc/MarkSweep.c @@ -46,7 +46,7 @@ const size_t kWordSize = sizeof(Word); /* Do not cast the result of this to a boolean; the only set bit * may be > 1<<8. */ -static inline long isMarked(const void *obj, const GcMarkContext *ctx) +static long isMarked(const void *obj, const GcMarkContext *ctx) { return dvmHeapBitmapIsObjectBitSet(ctx->bitmap, obj); } |