Revision: 24381
Author: [email protected]
Date: Thu Oct 2 08:18:03 2014 UTC
Log: Fix name clashes in cctests.
[email protected]
Review URL: https://codereview.chromium.org/617123006
https://code.google.com/p/v8/source/detail?r=24381
Modified:
/branches/bleeding_edge/test/cctest/test-serialize.cc
=======================================
--- /branches/bleeding_edge/test/cctest/test-serialize.cc Thu Oct 2
07:12:46 2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-serialize.cc Thu Oct 2
08:18:03 2014 UTC
@@ -901,9 +901,10 @@
}
-class OneByteResource : public v8::String::ExternalOneByteStringResource {
+class SerializerOneByteResource
+ : public v8::String::ExternalOneByteStringResource {
public:
- OneByteResource(const char* data, size_t length)
+ SerializerOneByteResource(const char* data, size_t length)
: data_(data), length_(length) {}
virtual const char* data() const { return data_; }
virtual size_t length() const { return length_; }
@@ -914,11 +915,11 @@
};
-class TwoByteResource : public v8::String::ExternalStringResource {
+class SerializerTwoByteResource : public
v8::String::ExternalStringResource {
public:
- TwoByteResource(const char* data, size_t length)
+ SerializerTwoByteResource(const char* data, size_t length)
: data_(AsciiToTwoByteString(data)), length_(length) {}
- ~TwoByteResource() { DeleteArray<const uint16_t>(data_); }
+ ~SerializerTwoByteResource() { DeleteArray<const uint16_t>(data_); }
virtual const uint16_t* data() const { return data_; }
virtual size_t length() const { return length_; }
@@ -938,7 +939,7 @@
v8::HandleScope scope(CcTest::isolate());
// Obtain external internalized one-byte string.
- OneByteResource one_byte_resource("one_byte", 8);
+ SerializerOneByteResource one_byte_resource("one_byte", 8);
Handle<String> one_byte_string =
isolate->factory()->NewStringFromAsciiChecked("one_byte");
one_byte_string = isolate->factory()->InternalizeString(one_byte_string);
@@ -947,7 +948,7 @@
CHECK(one_byte_string->IsInternalizedString());
// Obtain external internalized two-byte string.
- TwoByteResource two_byte_resource("two_byte", 8);
+ SerializerTwoByteResource two_byte_resource("two_byte", 8);
Handle<String> two_byte_string =
isolate->factory()->NewStringFromAsciiChecked("two_byte");
two_byte_string = isolate->factory()->InternalizeString(two_byte_string);
@@ -1010,7 +1011,7 @@
ConstructSource(STATIC_CHAR_VECTOR(""), STATIC_CHAR_VECTOR("abcdef"),
STATIC_CHAR_VECTOR(""), 1000000);
Handle<String> name = f->NewStringFromOneByte(string).ToHandleChecked();
- OneByteResource one_byte_resource(
+ SerializerOneByteResource one_byte_resource(
reinterpret_cast<const char*>(string.start()), string.length());
name = f->InternalizeString(name);
name->MakeExternal(&one_byte_resource);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
