diff options
| author | Jiyong Park <jiyong@google.com> | 2018-08-02 18:38:04 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-08-02 18:38:04 +0900 |
| commit | f4c8b47b8efee20583b379cf1d7e53506d891e55 (patch) | |
| tree | 6cb74658c20ad5e44dea0ae5dcb86bf47a743e79 /libutils/RefBase.cpp | |
| parent | 2ee7d5fddfd437f35159ebe0db2127913a3a85a7 (diff) | |
| parent | f93e1931b360da17cae8a9fa86a2b287b12df1d8 (diff) | |
Merge QPR1.180718.001
Conflicts:
init/ueventd.cpp
libion/ion.c
lmkd/lmkd.c
rootdir/init.rc
Change-Id: I05419927e27be1148cd1a2665d51f9a715ab8d47
Diffstat (limited to 'libutils/RefBase.cpp')
| -rw-r--r-- | libutils/RefBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libutils/RefBase.cpp b/libutils/RefBase.cpp index 8eecaceeb..66f983a1b 100644 --- a/libutils/RefBase.cpp +++ b/libutils/RefBase.cpp @@ -712,7 +712,7 @@ RefBase::~RefBase() delete mRefs; } // For debugging purposes, clear mRefs. Ineffective against outstanding wp's. - const_cast<weakref_impl*&>(mRefs) = NULL; + const_cast<weakref_impl*&>(mRefs) = nullptr; } void RefBase::extendObjectLifetime(int32_t mode) |