diff options
| author | 2012-10-31 16:47:30 -0700 | |
|---|---|---|
| committer | 2012-10-31 16:47:31 -0700 | |
| commit | 332f6827edf72f9b3d247a6c2fa79e4d520a409d (patch) | |
| tree | f91c0c46526cbce22792940bf3408279f005608c /src/heap.cc | |
| parent | 701f0e08b9233306efc6daf2206f80f5d8260149 (diff) | |
| parent | e35517ad40e0713df8420aeb5d3540f146a59f62 (diff) | |
Merge "Remove disable card marks, fix SetPatchLocation." into dalvik-dev
Diffstat (limited to 'src/heap.cc')
| -rw-r--r-- | src/heap.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/heap.cc b/src/heap.cc index 2ed467f2d4..cf13eaec9a 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -137,7 +137,6 @@ Heap::Heap(size_t initial_size, size_t growth_limit, size_t min_free, size_t max card_table_(NULL), concurrent_gc_(concurrent_gc), have_zygote_space_(false), - card_marking_disabled_(false), is_gc_running_(false), last_gc_type_(kGcTypeNone), enforce_heap_growth_rate_(false), |