summaryrefslogtreecommitdiffstats
path: root/src/intern_table.cc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-08-11 17:44:34 -0700
committerElliott Hughes <enh@google.com>2011-08-11 22:02:10 -0700
commit40ef99eb9dd91c2fa549f40973964529c927bb3c (patch)
tree317dfd56abeacb4c0dd3cf7f63a4801828d7dff9 /src/intern_table.cc
parent5381cf941d26030199fcdbe61a614ff01e55a27c (diff)
downloadart-40ef99eb9dd91c2fa549f40973964529c927bb3c.zip
art-40ef99eb9dd91c2fa549f40973964529c927bb3c.tar.gz
art-40ef99eb9dd91c2fa549f40973964529c927bb3c.tar.bz2
Start implementing JNI.
This patch replaces our JniEnvironment class with the regular JNIEnv. This patch also adds support for .jar, .zip, and .apk files in the boot classpath. There's also an attempt at implementing JNIEnv::FindClass. I've also fixed a few scoped_ptr/scoped_array bugs (this kind of thing being the reason we use UniquePtr in libcore), and removed some unnecessary . The 'tools/art' script makes it easier to play with aexec on the command-line. Change-Id: Ic4f704c12e0071f17e95b6e182fdab9370ead9b0
Diffstat (limited to 'src/intern_table.cc')
-rw-r--r--src/intern_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intern_table.cc b/src/intern_table.cc
index 31749fd..3a0dff8 100644
--- a/src/intern_table.cc
+++ b/src/intern_table.cc
@@ -19,7 +19,7 @@ void InternTable::VisitRoots(Heap::RootVistor* root_visitor, void* arg) {
}
String* InternTable::Intern(int32_t utf16_length, const char* utf8_data_in) {
- scoped_ptr<uint16_t> utf16_data_out(new uint16_t[utf16_length]);
+ scoped_array<uint16_t> utf16_data_out(new uint16_t[utf16_length]);
String::ConvertModifiedUtf8ToUtf16(utf16_data_out.get(), utf8_data_in);
int32_t hash_code = String::ComputeUtf16Hash(utf16_data_out.get(), utf16_length);
{