diff options
| author | Andreas Gampe <agampe@google.com> | 2015-02-19 01:18:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-19 01:18:01 +0000 |
| commit | 2ee8837c49680fa0c928fb5d5fc6ef7ae6532eea (patch) | |
| tree | 1937bc229c062cc9600d80e6cb3b66f3852e448b /runtime/class_linker.cc | |
| parent | 887653c253e9d049d0817867db02392a9a3db40e (diff) | |
| parent | ab1eb0d1d047e3478ebb891e5259d2f1d1dd78bd (diff) | |
| download | art-2ee8837c49680fa0c928fb5d5fc6ef7ae6532eea.zip art-2ee8837c49680fa0c928fb5d5fc6ef7ae6532eea.tar.gz art-2ee8837c49680fa0c928fb5d5fc6ef7ae6532eea.tar.bz2 | |
Merge "ART: Templatize IsInt & IsUint"
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 8609807..f554c61 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -4812,7 +4812,7 @@ bool ClassLinker::LinkMethods(Thread* self, Handle<mirror::Class> klass, if (klass->IsInterface()) { // No vtable. size_t count = klass->NumVirtualMethods(); - if (!IsUint(16, count)) { + if (!IsUint<16>(count)) { ThrowClassFormatError(klass.Get(), "Too many methods on interface: %zd", count); return false; } @@ -5033,7 +5033,7 @@ bool ClassLinker::LinkVirtualMethods(Thread* self, Handle<mirror::Class> klass) local_method->SetMethodIndex(actual_count); ++actual_count; } - if (!IsUint(16, actual_count)) { + if (!IsUint<16>(actual_count)) { ThrowClassFormatError(klass.Get(), "Too many methods defined on class: %zd", actual_count); return false; } @@ -5049,7 +5049,7 @@ bool ClassLinker::LinkVirtualMethods(Thread* self, Handle<mirror::Class> klass) klass->SetVTable(vtable.Get()); } else { CHECK_EQ(klass.Get(), GetClassRoot(kJavaLangObject)); - if (!IsUint(16, num_virtual_methods)) { + if (!IsUint<16>(num_virtual_methods)) { ThrowClassFormatError(klass.Get(), "Too many methods: %d", static_cast<int>(num_virtual_methods)); return false; |