summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-01-24 05:18:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-24 05:18:25 +0000
commit336247fa6deba2948f5ede1df806f48cf67c790a (patch)
tree4bd13491acffa213137b7c675650789b13c210a2
parentd664b16a65962601e2fee5d35656ef59f6471788 (diff)
parent6c08a453c7fac58388bcf4cd521b4075ef5840d9 (diff)
downloadandroid_art-336247fa6deba2948f5ede1df806f48cf67c790a.tar.gz
android_art-336247fa6deba2948f5ede1df806f48cf67c790a.tar.bz2
android_art-336247fa6deba2948f5ede1df806f48cf67c790a.zip
Merge "ART: Fix new[] / delete mismatch"
-rw-r--r--runtime/gc/collector/concurrent_copying.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h
index d740bf2109..43f520a52a 100644
--- a/runtime/gc/collector/concurrent_copying.h
+++ b/runtime/gc/collector/concurrent_copying.h
@@ -129,7 +129,7 @@ class MarkQueue {
Atomic<size_t> tail_;
size_t size_;
- std::unique_ptr<Atomic<mirror::Object*>> buf_;
+ std::unique_ptr<Atomic<mirror::Object*>[]> buf_;
};
class ConcurrentCopying : public GarbageCollector {