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

Unified Diff: net/websockets/websocket_test_util.cc

Issue 1399303002: net/websockets: Convert int types from basictypes.h to the ones from stdint.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: websocket_deflate_stream.cc Created 5 years, 2 months 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/websockets/websocket_test_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_test_util.cc
diff --git a/net/websockets/websocket_test_util.cc b/net/websockets/websocket_test_util.cc
index fd5421a59b3ffaf3d8775a980cdc702839e2569c..fc494e6e0d0742205b54e80a2e7c099315f4b039 100644
--- a/net/websockets/websocket_test_util.cc
+++ b/net/websockets/websocket_test_util.cc
@@ -18,20 +18,20 @@
namespace net {
namespace {
-const uint64 kA =
- (static_cast<uint64>(0x5851f42d) << 32) + static_cast<uint64>(0x4c957f2d);
-const uint64 kC = 12345;
-const uint64 kM = static_cast<uint64>(1) << 48;
+const uint64_t kA = (static_cast<uint64_t>(0x5851f42d) << 32) +
+ static_cast<uint64_t>(0x4c957f2d);
+const uint64_t kC = 12345;
+const uint64_t kM = static_cast<uint64_t>(1) << 48;
} // namespace
-LinearCongruentialGenerator::LinearCongruentialGenerator(uint32 seed)
+LinearCongruentialGenerator::LinearCongruentialGenerator(uint32_t seed)
: current_(seed) {}
-uint32 LinearCongruentialGenerator::Generate() {
- uint64 result = current_;
+uint32_t LinearCongruentialGenerator::Generate() {
+ uint64_t result = current_;
current_ = (current_ * kA + kC) % kM;
- return static_cast<uint32>(result >> 16);
+ return static_cast<uint32_t>(result >> 16);
}
std::string WebSocketStandardRequest(const std::string& path,
« no previous file with comments | « net/websockets/websocket_test_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698