diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-20 23:29:55 +0000 |
| commit | 338f7285d7e3b6cec739fde87af9a02330155a12 (patch) | |
| tree | 02f47476e0afe81b9dbde614e9d560dabfe2f2b4 | |
| parent | 35152756c6acf9f7af4deed494afb0990b6087cd (diff) | |
| parent | d438de8d67fa412c4ee4252e4c09a1c1ca9ef0f5 (diff) | |
| download | chromium-libpac-338f7285d7e3b6cec739fde87af9a02330155a12.tar.gz | |
Merge "Cast from char16_t to uint16_t where appropriate."
| -rw-r--r-- | src/proxy_resolver_v8.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index 4d43253..edcfc52 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -103,7 +103,7 @@ class V8ExternalStringFromScriptData : script_data_(script_data) {} virtual const uint16_t* data() const { - return script_data_.string(); + return reinterpret_cast<const uint16_t*>(script_data_.string()); } virtual size_t length() const { @@ -164,7 +164,7 @@ std::string V8StringToUTF8(v8::Handle<v8::String> s) { android::String16 V8StringToUTF16(v8::Handle<v8::String> s) { int len = s->Length(); char16_t* buf = new char16_t[len + 1]; - s->Write(buf, 0, len); + s->Write(reinterpret_cast<uint16_t*>(buf), 0, len); android::String16 ret(buf, len); delete buf; return ret; @@ -181,7 +181,9 @@ v8::Local<v8::String> ASCIIStringToV8String(v8::Isolate* isolate, const std::str } v8::Local<v8::String> UTF16StringToV8String(v8::Isolate* isolate, const android::String16& s) { - return v8::String::NewFromTwoByte(isolate, s.string(), v8::String::kNormalString, s.size()); + return v8::String::NewFromTwoByte( + isolate, reinterpret_cast<const uint16_t*>(s.string()), + v8::String::kNormalString, s.size()); } // Converts an ASCII string literal to a V8 string. |