summaryrefslogtreecommitdiffstats
path: root/vm/alloc/MarkSweep.cpp
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-04-27 14:44:47 -0700
committerCarl Shapiro <cshapiro@google.com>2011-04-27 14:44:47 -0700
commit50e5fd5984c9b0a6f0927ed5ddf13bde40e338c7 (patch)
tree240f8c8f7dab15ad2a0af2ff62453360c00db365 /vm/alloc/MarkSweep.cpp
parenta4f95fd7fbccefaafde931741208674379362911 (diff)
downloadandroid_dalvik-50e5fd5984c9b0a6f0927ed5ddf13bde40e338c7.tar.gz
android_dalvik-50e5fd5984c9b0a6f0927ed5ddf13bde40e338c7.tar.bz2
android_dalvik-50e5fd5984c9b0a6f0927ed5ddf13bde40e338c7.zip
Use C++ linkage in GC headers and remove unneeded typedefs.
Some interfaces in Alloc.h had to be left with C linkage as they are referenced by the interpreter assembler code. That dependency will be addressed in a future commit. Change-Id: I6b2097a2139ddf6b4b13e592710e241442e08488
Diffstat (limited to 'vm/alloc/MarkSweep.cpp')
-rw-r--r--vm/alloc/MarkSweep.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/alloc/MarkSweep.cpp b/vm/alloc/MarkSweep.cpp
index a81d3eab8..79588f2eb 100644
--- a/vm/alloc/MarkSweep.cpp
+++ b/vm/alloc/MarkSweep.cpp
@@ -234,10 +234,10 @@ static void visitCardTable(Visitor *visitor, u1 *base, u1 *limit, void *arg)
}
}
-typedef struct {
+struct ScanImmuneObjectContext {
Object *threatenBoundary;
Object *currObject;
-} ScanImmuneObjectContext;
+};
/*
* Marks the referent of an immune object it is threatened.
@@ -968,11 +968,11 @@ void dvmHeapFinishMarkStep()
ctx->finger = NULL;
}
-typedef struct {
+struct SweepContext {
size_t numObjects;
size_t numBytes;
bool isConcurrent;
-} SweepContext;
+};
static void sweepBitmapCallback(size_t numPtrs, void **ptrs, void *arg)
{