diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:04:58 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:30 +0000 |
| commit | 589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch) | |
| tree | 1d9032fcae9d18a05430a4ba9c14e5c635c4096e /src/messages.cc | |
| parent | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff) | |
| download | android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.bz2 android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.zip | |
Upgrade to V8 3.6
Merge V8 at 3.6.6.11
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'src/messages.cc')
| -rw-r--r-- | src/messages.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/messages.cc b/src/messages.cc index 4cbf0af7..b6ad5ac3 100644 --- a/src/messages.cc +++ b/src/messages.cc @@ -41,13 +41,13 @@ namespace internal { // by default. void MessageHandler::DefaultMessageReport(const MessageLocation* loc, Handle<Object> message_obj) { - SmartPointer<char> str = GetLocalizedMessage(message_obj); + SmartArrayPointer<char> str = GetLocalizedMessage(message_obj); if (loc == NULL) { PrintF("%s\n", *str); } else { HandleScope scope; Handle<Object> data(loc->script()->name()); - SmartPointer<char> data_str; + SmartArrayPointer<char> data_str; if (data->IsString()) data_str = Handle<String>::cast(data)->ToCString(DISALLOW_NULLS); PrintF("%s:%i: %s\n", *data_str ? *data_str : "<unknown>", @@ -170,7 +170,8 @@ Handle<String> MessageHandler::GetMessage(Handle<Object> data) { } -SmartPointer<char> MessageHandler::GetLocalizedMessage(Handle<Object> data) { +SmartArrayPointer<char> MessageHandler::GetLocalizedMessage( + Handle<Object> data) { HandleScope scope; return GetMessage(data)->ToCString(DISALLOW_NULLS); } |