| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index 00ea4f23db502aefcb91454502c3293c4a47d9e2..8d278ec7cab25a4a26fdefa462f488f62924a813 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -5082,13 +5082,13 @@ String::FlatContent String::GetFlatContent() {
|
| }
|
|
|
|
|
| -SmartPointer<char> String::ToCString(AllowNullsFlag allow_nulls,
|
| - RobustnessFlag robust_flag,
|
| - int offset,
|
| - int length,
|
| - int* length_return) {
|
| +SmartArrayPointer<char> String::ToCString(AllowNullsFlag allow_nulls,
|
| + RobustnessFlag robust_flag,
|
| + int offset,
|
| + int length,
|
| + int* length_return) {
|
| if (robust_flag == ROBUST_STRING_TRAVERSAL && !LooksValid()) {
|
| - return SmartPointer<char>(NULL);
|
| + return SmartArrayPointer<char>(NULL);
|
| }
|
| Heap* heap = GetHeap();
|
|
|
| @@ -5132,13 +5132,13 @@ SmartPointer<char> String::ToCString(AllowNullsFlag allow_nulls,
|
| character_position++;
|
| }
|
| result[utf8_byte_position] = 0;
|
| - return SmartPointer<char>(result);
|
| + return SmartArrayPointer<char>(result);
|
| }
|
|
|
|
|
| -SmartPointer<char> String::ToCString(AllowNullsFlag allow_nulls,
|
| - RobustnessFlag robust_flag,
|
| - int* length_return) {
|
| +SmartArrayPointer<char> String::ToCString(AllowNullsFlag allow_nulls,
|
| + RobustnessFlag robust_flag,
|
| + int* length_return) {
|
| return ToCString(allow_nulls, robust_flag, 0, -1, length_return);
|
| }
|
|
|
| @@ -5169,9 +5169,9 @@ const uc16* String::GetTwoByteData(unsigned start) {
|
| }
|
|
|
|
|
| -SmartPointer<uc16> String::ToWideCString(RobustnessFlag robust_flag) {
|
| +SmartArrayPointer<uc16> String::ToWideCString(RobustnessFlag robust_flag) {
|
| if (robust_flag == ROBUST_STRING_TRAVERSAL && !LooksValid()) {
|
| - return SmartPointer<uc16>();
|
| + return SmartArrayPointer<uc16>();
|
| }
|
| Heap* heap = GetHeap();
|
|
|
| @@ -5187,7 +5187,7 @@ SmartPointer<uc16> String::ToWideCString(RobustnessFlag robust_flag) {
|
| result[i++] = character;
|
| }
|
| result[i] = 0;
|
| - return SmartPointer<uc16>(result);
|
| + return SmartArrayPointer<uc16>(result);
|
| }
|
|
|
|
|
| @@ -6404,7 +6404,7 @@ Object* JSFunction::SetInstanceClassName(String* name) {
|
|
|
|
|
| void JSFunction::PrintName(FILE* out) {
|
| - SmartPointer<char> name = shared()->DebugName()->ToCString();
|
| + SmartArrayPointer<char> name = shared()->DebugName()->ToCString();
|
| PrintF(out, "%s", *name);
|
| }
|
|
|
|
|