diff options
| author | 2017-02-22 19:48:44 +0000 | |
|---|---|---|
| committer | 2017-02-22 19:48:45 +0000 | |
| commit | 6902b51db7e5040c05fa3be0f9186ca5eff77f80 (patch) | |
| tree | 4454a31f1ec932b3ac71e7a20f4796285b1fbcd3 /runtime/gc_root.h | |
| parent | 140e5c88058cb60542ba1f22b6fd1f2b66a239f8 (diff) | |
| parent | c73cb64585f301c8bb3b03a0684f6baead99b7ac (diff) | |
Merge "ART: Remove ObjPtr kPoison template parameter"
Diffstat (limited to 'runtime/gc_root.h')
| -rw-r--r-- | runtime/gc_root.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc_root.h b/runtime/gc_root.h index 79e80f148c..0894e9bee5 100644 --- a/runtime/gc_root.h +++ b/runtime/gc_root.h @@ -24,7 +24,7 @@ namespace art { class ArtField; class ArtMethod; -template<class MirrorType, bool kPoison> class ObjPtr; +template<class MirrorType> class ObjPtr; namespace mirror { class Object; @@ -215,7 +215,7 @@ class GcRoot { ALWAYS_INLINE GcRoot() {} explicit ALWAYS_INLINE GcRoot(MirrorType* ref) REQUIRES_SHARED(Locks::mutator_lock_); - explicit ALWAYS_INLINE GcRoot(ObjPtr<MirrorType, kIsDebugBuild> ref) + explicit ALWAYS_INLINE GcRoot(ObjPtr<MirrorType> ref) REQUIRES_SHARED(Locks::mutator_lock_); private: |