Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: net/spdy/spdy_test_utils.cc

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_test_utils.h ('k') | net/spdy/spdy_write_queue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_test_utils.cc
diff --git a/net/spdy/spdy_test_utils.cc b/net/spdy/spdy_test_utils.cc
index de517c6376008d2ed6a5d986d1db98da774c572b..bc0dc17f66ad9fb17e88ad5e95001801ebe8b908 100644
--- a/net/spdy/spdy_test_utils.cc
+++ b/net/spdy/spdy_test_utils.cc
@@ -89,7 +89,7 @@ void CompareCharArraysWithHexError(
}
void SetFrameFlags(SpdyFrame* frame,
- uint8 flags,
+ uint8_t flags,
SpdyMajorVersion spdy_version) {
switch (spdy_version) {
case SPDY2:
@@ -110,7 +110,7 @@ void SetFrameLength(SpdyFrame* frame,
case SPDY3:
CHECK_EQ(0u, length & ~kLengthMask);
{
- int32 wire_length = base::HostToNet32(length);
+ int32_t wire_length = base::HostToNet32(length);
// The length field in SPDY 2 and 3 is a 24-bit (3B) integer starting at
// offset 5.
memcpy(frame->data() + 5, reinterpret_cast<char*>(&wire_length) + 1, 3);
@@ -119,7 +119,7 @@ void SetFrameLength(SpdyFrame* frame,
case HTTP2:
CHECK_GT(1u<<14, length);
{
- int32 wire_length = base::HostToNet32(length);
+ int32_t wire_length = base::HostToNet32(length);
memcpy(frame->data(),
reinterpret_cast<char*>(&wire_length) + 1,
3);
@@ -131,7 +131,7 @@ void SetFrameLength(SpdyFrame* frame,
}
std::string a2b_hex(const char* hex_data) {
- std::vector<uint8> output;
+ std::vector<uint8_t> output;
std::string result;
if (base::HexStringToBytes(hex_data, &output))
result.assign(reinterpret_cast<const char*>(&output[0]), output.size());
« no previous file with comments | « net/spdy/spdy_test_utils.h ('k') | net/spdy/spdy_write_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698