summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 22:13:43 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 22:13:43 +0000
commit887cec87432cce92d06a39b62a9ce4f57260acc9 (patch)
tree910e78a9e37009c7774a097872d2769ca50226db /remoting/jingle_glue
parent0c860d067e62556bad67620240abc9abfeb85c7d (diff)
downloadchromium_src-887cec87432cce92d06a39b62a9ce4f57260acc9.zip
chromium_src-887cec87432cce92d06a39b62a9ce4f57260acc9.tar.gz
chromium_src-887cec87432cce92d06a39b62a9ce4f57260acc9.tar.bz2
Tighten up compile warnings based to match other chromium sub-projects.
Fix up the issues that the new warnings raised. BUG=none TEST=build remoting cleanly Review URL: http://codereview.chromium.org/2801003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/jingle_channel.cc2
-rw-r--r--remoting/jingle_glue/jingle_client.cc3
-rw-r--r--remoting/jingle_glue/jingle_thread.cc6
3 files changed, 7 insertions, 4 deletions
diff --git a/remoting/jingle_glue/jingle_channel.cc b/remoting/jingle_glue/jingle_channel.cc
index 8111985..49bfc5b4 100644
--- a/remoting/jingle_glue/jingle_channel.cc
+++ b/remoting/jingle_glue/jingle_channel.cc
@@ -20,8 +20,8 @@ const size_t kReadBufferSize = 4096;
JingleChannel::JingleChannel(Callback* callback)
: state_(INITIALIZING),
- event_handler_(this),
callback_(callback),
+ event_handler_(this),
write_buffer_size_(0),
current_write_buf_pos_(0) {
DCHECK(callback_ != NULL);
diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc
index 8fb0714..b1cecdc 100644
--- a/remoting/jingle_glue/jingle_client.cc
+++ b/remoting/jingle_glue/jingle_client.cc
@@ -179,6 +179,9 @@ void JingleClient::OnConnectionStateChanged(buzz::XmppEngine::State state) {
case buzz::XmppEngine::STATE_CLOSED:
UpdateState(CLOSED);
break;
+ default:
+ NOTREACHED();
+ break;
}
}
diff --git a/remoting/jingle_glue/jingle_thread.cc b/remoting/jingle_glue/jingle_thread.cc
index 5090251..ee02a5c 100644
--- a/remoting/jingle_glue/jingle_thread.cc
+++ b/remoting/jingle_glue/jingle_thread.cc
@@ -28,9 +28,9 @@ void TaskPump::OnMessage(talk_base::Message* pmsg) {
}
JingleThread::JingleThread()
- : message_loop_(NULL),
- task_pump_(NULL),
- started_event_(true, false) { }
+ : task_pump_(NULL),
+ started_event_(true, false),
+ message_loop_(NULL) { }
JingleThread::~JingleThread() { }