summaryrefslogtreecommitdiff
path: root/p2p/client
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-25 00:31:35 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-03-25 00:31:35 +0000
commit9750eddb6cf86a3958f5fedb4c6ada2d95069919 (patch)
tree341d55cce348cc9a367d4918c6652c7fb41e23b7 /p2p/client
parentbb288156332dd2e684f0dde156bd984c73da210b (diff)
downloadtalk-9750eddb6cf86a3958f5fedb4c6ada2d95069919.tar.gz
Cleanups in libjingle to make it compile with chromium_code=1
Fixed all warnings that show up when compiling libjingle in chromium with compiling with chromium_code=1. chromium_code=1 enables various warnings that are off by default. Most changes are for unused variables and consts. R=pthatcher@google.com, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/9699004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5769 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'p2p/client')
-rw-r--r--p2p/client/basicportallocator.cc2
-rw-r--r--p2p/client/basicportallocator.h1
-rw-r--r--p2p/client/httpportallocator.cc3
3 files changed, 0 insertions, 6 deletions
diff --git a/p2p/client/basicportallocator.cc b/p2p/client/basicportallocator.cc
index 9e2ce07..7c285d1 100644
--- a/p2p/client/basicportallocator.cc
+++ b/p2p/client/basicportallocator.cc
@@ -56,7 +56,6 @@ const uint32 MSG_SEQUENCEOBJECTS_CREATED = 6;
const uint32 MSG_CONFIG_STOP = 7;
const uint32 ALLOCATE_DELAY = 250;
-const uint32 ALLOCATION_STEP_DELAY = 1 * 1000;
const int PHASE_UDP = 0;
const int PHASE_RELAY = 1;
@@ -238,7 +237,6 @@ BasicPortAllocatorSession::BasicPortAllocatorSession(
ice_ufrag, ice_pwd, allocator->flags()),
allocator_(allocator), network_thread_(NULL),
socket_factory_(allocator->socket_factory()),
- configuration_done_(false),
allocation_started_(false),
network_manager_started_(false),
running_(false),
diff --git a/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h
index 1fc6ebe..c46c29a 100644
--- a/p2p/client/basicportallocator.h
+++ b/p2p/client/basicportallocator.h
@@ -204,7 +204,6 @@ class BasicPortAllocatorSession : public PortAllocatorSession,
talk_base::Thread* network_thread_;
talk_base::scoped_ptr<talk_base::PacketSocketFactory> owned_socket_factory_;
talk_base::PacketSocketFactory* socket_factory_;
- bool configuration_done_;
bool allocation_started_;
bool network_manager_started_;
bool running_; // set when StartGetAllPorts is called
diff --git a/p2p/client/httpportallocator.cc b/p2p/client/httpportallocator.cc
index e54acba..b881d43 100644
--- a/p2p/client/httpportallocator.cc
+++ b/p2p/client/httpportallocator.cc
@@ -41,9 +41,6 @@
namespace {
-const uint32 MSG_TIMEOUT = 100; // must not conflict
- // with BasicPortAllocator.cpp
-
// Helper routine to remove whitespace from the ends of a string.
void Trim(std::string& str) {
size_t first = str.find_first_not_of(" \t\r\n");