diff options
author | avi <avi@chromium.org> | 2015-12-21 19:14:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-22 03:15:12 +0000 |
commit | 4856ced07dfda549a142df3a5fa28cbb73bf1865 (patch) | |
tree | a81aceedc8ee5507d9f22fb4f163d847bfae6d28 /sync/tools/testserver/run_sync_testserver.cc | |
parent | 5af9dfc5f6ed2163b13d8c20d679bdb44c783769 (diff) | |
download | chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.zip chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.gz chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.bz2 |
Switch to standard integer types in sync/.
BUG=138542
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1545553003
Cr-Commit-Position: refs/heads/master@{#366533}
Diffstat (limited to 'sync/tools/testserver/run_sync_testserver.cc')
-rw-r--r-- | sync/tools/testserver/run_sync_testserver.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sync/tools/testserver/run_sync_testserver.cc b/sync/tools/testserver/run_sync_testserver.cc index 414076a..2057db2 100644 --- a/sync/tools/testserver/run_sync_testserver.cc +++ b/sync/tools/testserver/run_sync_testserver.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> #include <stdio.h> #include "base/at_exit.h" @@ -54,7 +55,7 @@ static bool RunSyncTest( // Gets a port value from the switch with name |switch_name| and writes it to // |port|. Returns true if a port was provided and false otherwise. -static bool GetPortFromSwitch(const std::string& switch_name, uint16* port) { +static bool GetPortFromSwitch(const std::string& switch_name, uint16_t* port) { DCHECK(port != NULL) << "|port| is NULL"; base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); int port_int = 0; @@ -64,7 +65,7 @@ static bool GetPortFromSwitch(const std::string& switch_name, uint16* port) { return false; } } - *port = static_cast<uint16>(port_int); + *port = static_cast<uint16_t>(port_int); return true; } @@ -99,10 +100,10 @@ int main(int argc, const char* argv[]) { return RunSyncTest(FILE_PATH_LITERAL("xmppserver_test.py")) ? 0 : -1; } - uint16 port = 0; + uint16_t port = 0; GetPortFromSwitch("port", &port); - uint16 xmpp_port = 0; + uint16_t xmpp_port = 0; GetPortFromSwitch("xmpp-port", &xmpp_port); scoped_ptr<syncer::LocalSyncTestServer> test_server( |