diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 18:25:00 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 18:25:00 +0000 |
| commit | 01037a65346b48d19e058d9d865fd62dbecba856 (patch) | |
| tree | 9ac2f255c08cb46c032ebf290c46f9561b11cbb9 | |
| parent | b8a9f7978d8bc3adb5d7d9d1fe5a9836ce275191 (diff) | |
| download | chromium_src-01037a65346b48d19e058d9d865fd62dbecba856.zip chromium_src-01037a65346b48d19e058d9d865fd62dbecba856.tar.gz chromium_src-01037a65346b48d19e058d9d865fd62dbecba856.tar.bz2 | |
Miscellanous changes detected by strict aliasing warnings.
BUG=32204, 92681
R=dmichael@chromium.org, sergeyu@chromium.org
Review URL: https://codereview.chromium.org/26406002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227548 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/pepper/pepper_plugin_instance_impl.cc | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_util.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index 0974e5f..7dfd708 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -469,7 +469,7 @@ void PepperPluginInstanceImpl::GamepadImpl::Sample( WebKit::WebGamepads webkit_data; RenderThreadImpl::current()->SampleGamepads(&webkit_data); ConvertWebKitGamepadData( - *reinterpret_cast<const ppapi::WebKitGamepads*>(&webkit_data), data); + bit_cast<ppapi::WebKitGamepads>(webkit_data), data); } PepperPluginInstanceImpl::PepperPluginInstanceImpl( diff --git a/remoting/client/plugin/pepper_util.cc b/remoting/client/plugin/pepper_util.cc index 5acfa01..d00189c 100644 --- a/remoting/client/plugin/pepper_util.cc +++ b/remoting/client/plugin/pepper_util.cc @@ -58,7 +58,7 @@ void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address, PP_NetAddress_IPv4 ipv4_addr; CHECK(pp_net_address.DescribeAsIPv4Address(&ipv4_addr)); address->SetIP(talk_base::IPAddress( - *reinterpret_cast<in_addr*>(&ipv4_addr.addr))); + bit_cast<in_addr>(ipv4_addr.addr))); address->SetPort(base::NetToHost16(ipv4_addr.port)); return; } @@ -66,7 +66,7 @@ void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address, PP_NetAddress_IPv6 ipv6_addr; CHECK(pp_net_address.DescribeAsIPv6Address(&ipv6_addr)); address->SetIP(talk_base::IPAddress( - *reinterpret_cast<in6_addr*>(&ipv6_addr.addr))); + bit_cast<in6_addr>(ipv6_addr.addr))); address->SetPort(base::NetToHost16(ipv6_addr.port)); return; } |