diff options
| author | martijn <martijn@martijnc.be> | 2016-03-14 11:28:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 18:29:42 +0000 |
| commit | d8dafabef48beaeb88359b5bf04dd2a47cd30273 (patch) | |
| tree | 017ba5ca1a228975d20dd23df7da021801c0da2a /ppapi/shared_impl/private | |
| parent | 1468804bebd13b91edfea4f8423b17f414f15bb6 (diff) | |
| download | chromium_src-d8dafabef48beaeb88359b5bf04dd2a47cd30273.zip chromium_src-d8dafabef48beaeb88359b5bf04dd2a47cd30273.tar.gz chromium_src-d8dafabef48beaeb88359b5bf04dd2a47cd30273.tar.bz2 | |
Migrate net/udp/* to net::IPAddress.
BUG=496258
Review URL: https://codereview.chromium.org/1778793003
Cr-Commit-Position: refs/heads/master@{#381019}
Diffstat (limited to 'ppapi/shared_impl/private')
| -rw-r--r-- | ppapi/shared_impl/private/net_address_private_impl.cc | 4 | ||||
| -rw-r--r-- | ppapi/shared_impl/private/net_address_private_impl.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc index 07d61d7..c945808 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.cc +++ b/ppapi/shared_impl/private/net_address_private_impl.cc @@ -450,7 +450,7 @@ bool NetAddressPrivateImpl::SockaddrToNetAddress( // static bool NetAddressPrivateImpl::IPEndPointToNetAddress( - const std::vector<unsigned char>& address, + const std::vector<uint8_t>& address, uint16_t port, PP_NetAddress_Private* addr) { if (!addr) @@ -483,7 +483,7 @@ bool NetAddressPrivateImpl::IPEndPointToNetAddress( // static bool NetAddressPrivateImpl::NetAddressToIPEndPoint( const PP_NetAddress_Private& addr, - std::vector<unsigned char>* address, + std::vector<uint8_t>* address, uint16_t* port) { if (!address || !port) return false; diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h index a7867dd..dd4b56a 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.h +++ b/ppapi/shared_impl/private/net_address_private_impl.h @@ -5,6 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_ #define PPAPI_SHARED_IMPL_PRIVATE_NET_ADDRESS_PRIVATE_IMPL_H_ +#include <stdint.h> #include <string> #include <vector> @@ -26,12 +27,12 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl { uint32_t sa_length, PP_NetAddress_Private* net_addr); - static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address, + static bool IPEndPointToNetAddress(const std::vector<uint8_t>& address, uint16_t port, PP_NetAddress_Private* net_addr); static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr, - std::vector<unsigned char>* address, + std::vector<uint8_t>* address, uint16_t* port); static std::string DescribeNetAddress(const PP_NetAddress_Private& addr, |