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

Unified Diff: net/tools/balsa/balsa_frame.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/third_party/mozilla_security_manager/nsPKCS12Blob.h ('k') | net/tools/balsa/balsa_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/balsa/balsa_frame.h
diff --git a/net/tools/balsa/balsa_frame.h b/net/tools/balsa/balsa_frame.h
index 27f27ea53d2cf4121339f342049ed557511ffcef..97025ddba44951621f372f5e19ccc247e3b6fec7 100644
--- a/net/tools/balsa/balsa_frame.h
+++ b/net/tools/balsa/balsa_frame.h
@@ -5,6 +5,9 @@
#ifndef NET_TOOLS_BALSA_BALSA_FRAME_H_
#define NET_TOOLS_BALSA_BALSA_FRAME_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <utility>
#include <vector>
@@ -34,16 +37,10 @@ class BalsaFrame {
// TODO(fenix): get rid of the 'kValidTerm*' stuff by using the 'since last
// index' strategy. Note that this implies getting rid of the HeaderFramed()
- static const uint32 kValidTerm1 = '\n' << 16 |
- '\r' << 8 |
- '\n';
- static const uint32 kValidTerm1Mask = 0xFF << 16 |
- 0xFF << 8 |
- 0xFF;
- static const uint32 kValidTerm2 = '\n' << 8 |
- '\n';
- static const uint32 kValidTerm2Mask = 0xFF << 8 |
- 0xFF;
+ static const uint32_t kValidTerm1 = '\n' << 16 | '\r' << 8 | '\n';
+ static const uint32_t kValidTerm1Mask = 0xFF << 16 | 0xFF << 8 | 0xFF;
+ static const uint32_t kValidTerm2 = '\n' << 8 | '\n';
+ static const uint32_t kValidTerm2Mask = 0xFF << 8 | 0xFF;
BalsaFrame();
~BalsaFrame();
@@ -245,7 +242,7 @@ class BalsaFrame {
const char* last_slash_n_loc_;
const char* last_recorded_slash_n_loc_;
size_t last_slash_n_idx_;
- uint32 term_chars_;
+ uint32_t term_chars_;
BalsaFrameEnums::ParseState parse_state_;
BalsaFrameEnums::ErrorCode last_error_;
« no previous file with comments | « net/third_party/mozilla_security_manager/nsPKCS12Blob.h ('k') | net/tools/balsa/balsa_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698