diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-12-21 09:58:16 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-12-21 09:58:16 -0800 |
| commit | 9865bde5d822f56c4732214c2005dfcaa41f94cf (patch) | |
| tree | cd2eae058f4f4f13b5a82ff557b7eaaf13a1ecfb /oatdump | |
| parent | 115a02b737dd5f4d485b2f6c359e02988df66b83 (diff) | |
| download | art-9865bde5d822f56c4732214c2005dfcaa41f94cf.tar.gz art-9865bde5d822f56c4732214c2005dfcaa41f94cf.tar.bz2 art-9865bde5d822f56c4732214c2005dfcaa41f94cf.zip | |
Rename NullHandle to ScopedNullHandle
This makes it clearer that is invalid to do things like:
Handle<T> h = ScopedNullHandle<T>();
Bug: 26233305
Change-Id: I6d8f54eae01ec2e901cb7043afa853ea77db79fe
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index 58331296bf..bad928e9e8 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -2380,7 +2380,7 @@ class ImageDumper { static int DumpImage(Runtime* runtime, const char* image_location, OatDumperOptions* options, std::ostream* os) { // Dumping the image, no explicit class loader. - NullHandle<mirror::ClassLoader> null_class_loader; + ScopedNullHandle<mirror::ClassLoader> null_class_loader; options->class_loader_ = &null_class_loader; ScopedObjectAccess soa(Thread::Current()); @@ -2439,7 +2439,7 @@ static int DumpOatWithRuntime(Runtime* runtime, OatFile* oat_file, OatDumperOpti static int DumpOatWithoutRuntime(OatFile* oat_file, OatDumperOptions* options, std::ostream* os) { CHECK(oat_file != nullptr && options != nullptr); // No image = no class loader. - NullHandle<mirror::ClassLoader> null_class_loader; + ScopedNullHandle<mirror::ClassLoader> null_class_loader; options->class_loader_ = &null_class_loader; OatDumper oat_dumper(*oat_file, *options); |