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

Unified Diff: net/quic/quic_framer.h

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/quic/quic_frame_list.h ('k') | net/quic/quic_framer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_framer.h
diff --git a/net/quic/quic_framer.h b/net/quic/quic_framer.h
index 2f1e15caab8c55c4ba4e1708de253b5b80f3939e..3e5e71984ef8cf3cf670a5472aba5b282a7a2e40 100644
--- a/net/quic/quic_framer.h
+++ b/net/quic/quic_framer.h
@@ -5,11 +5,14 @@
#ifndef NET_QUIC_QUIC_FRAMER_H_
#define NET_QUIC_QUIC_FRAMER_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "net/base/net_export.h"
@@ -357,7 +360,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
private:
friend class test::QuicFramerPeer;
- typedef std::map<QuicPacketNumber, uint8> NackRangeMap;
+ typedef std::map<QuicPacketNumber, uint8_t> NackRangeMap;
struct AckFrameInfo {
AckFrameInfo();
@@ -400,10 +403,10 @@ class NET_EXPORT_PRIVATE QuicFramer {
QuicPacketNumber* packet_number);
bool ProcessFrameData(QuicDataReader* reader, const QuicPacketHeader& header);
bool ProcessStreamFrame(QuicDataReader* reader,
- uint8 frame_type,
+ uint8_t frame_type,
QuicStreamFrame* frame);
bool ProcessAckFrame(QuicDataReader* reader,
- uint8 frame_type,
+ uint8_t frame_type,
QuicAckFrame* frame);
bool ProcessTimestampsInAckFrame(QuicDataReader* reader, QuicAckFrame* frame);
bool ProcessStopWaitingFrame(QuicDataReader* reader,
@@ -432,7 +435,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
// Returns the QuicTime::Delta corresponding to the time from when the framer
// was created.
- const QuicTime::Delta CalculateTimestampFromWire(uint32 time_delta_us);
+ const QuicTime::Delta CalculateTimestampFromWire(uint32_t time_delta_us);
// Computes the wire size in bytes of the |ack| frame, assuming no truncation.
size_t GetAckFrameSize(const QuicAckFrame& ack,
@@ -449,7 +452,7 @@ class NET_EXPORT_PRIVATE QuicFramer {
QuicPacketNumber packet_number,
QuicDataWriter* writer);
- static uint8 GetSequenceNumberFlags(
+ static uint8_t GetSequenceNumberFlags(
QuicPacketNumberLength packet_number_length);
static AckFrameInfo GetAckFrameInfo(const QuicAckFrame& frame);
« no previous file with comments | « net/quic/quic_frame_list.h ('k') | net/quic/quic_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698