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

Unified Diff: net/tools/flip_server/balsa_headers.cc

Issue 4541002: Revert 65313 - flip_in_mem_edsm_server builds again.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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/net.gyp ('k') | net/tools/flip_server/epoll_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/flip_server/balsa_headers.cc
===================================================================
--- net/tools/flip_server/balsa_headers.cc (revision 65313)
+++ net/tools/flip_server/balsa_headers.cc (working copy)
@@ -7,11 +7,11 @@
#include <emmintrin.h>
#include <algorithm>
+#include <ext/hash_set>
#include <string>
#include <utility>
#include <vector>
-#include "base/hash_tables.h"
#include "base/logging.h"
#include "base/port.h"
#include "base/string_piece.h"
@@ -29,9 +29,9 @@
const char kTransferEncoding[] = "Transfer-Encoding";
const char kSpaceChar = ' ';
-base::hash_set<base::StringPiece,
- net::StringPieceCaseHash,
- net::StringPieceCaseEqual> g_multivalued_headers;
+__gnu_cxx::hash_set<base::StringPiece,
+ net::StringPieceCaseHash,
+ net::StringPieceCaseEqual> g_multivalued_headers;
void InitMultivaluedHeaders() {
g_multivalued_headers.insert("accept");
@@ -615,7 +615,7 @@
content_length_ = length;
// FastUInt64ToBuffer is supposed to use a maximum of kFastToBufferSize bytes.
char buffer[kFastToBufferSize];
- int len_converted = snprintf(buffer, sizeof(buffer), "%zu", length);
+ int len_converted = snprintf(buffer, sizeof(buffer), "%d", length);
CHECK_GT(len_converted, 0);
const base::StringPiece length_str(buffer, len_converted);
AppendHeader(content_length, length_str);
@@ -724,7 +724,7 @@
size_t parsed_response_code) {
char buffer[kFastToBufferSize];
int len_converted = snprintf(buffer, sizeof(buffer),
- "%zu", parsed_response_code);
+ "%d", parsed_response_code);
CHECK_GT(len_converted, 0);
SetResponseCode(base::StringPiece(buffer, len_converted));
}
« no previous file with comments | « net/net.gyp ('k') | net/tools/flip_server/epoll_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698