diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 02:44:32 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 02:44:32 +0000 |
| commit | 0116cf53e569e1c10db7febaf2ce027ce1e19d4a (patch) | |
| tree | 6da1fcee56c6676e5ea2e39b78655f021eff70b8 /remoting | |
| parent | 94f29e2e1d6758af5a6e726bde12394e3f9b8f28 (diff) | |
| download | chromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.zip chromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.tar.gz chromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.tar.bz2 | |
Roll libjingle 88:92
Beside other changes the new version of libjingle has
thread-safe QName class and has all std::string and QName
statics removed.
BUG=94993,102451
TEST=Compiles
Review URL: http://codereview.chromium.org/8413059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/heartbeat_sender.cc | 2 | ||||
| -rw-r--r-- | remoting/host/register_support_host_request.cc | 2 | ||||
| -rw-r--r-- | remoting/protocol/jingle_messages.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc index 1f28521..ecd35ca 100644 --- a/remoting/host/heartbeat_sender.cc +++ b/remoting/host/heartbeat_sender.cc @@ -114,7 +114,7 @@ void HeartbeatSender::ProcessResponse(const XmlElement* response) { } // This method must only be called for error or result stanzas. - DCHECK_EQ(buzz::STR_RESULT, type); + DCHECK_EQ(std::string(buzz::STR_RESULT), type); const XmlElement* result_element = response->FirstNamed(QName(kChromotingXmlNamespace, kHeartbeatResultTag)); diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc index d9e2166..338513d 100644 --- a/remoting/host/register_support_host_request.cc +++ b/remoting/host/register_support_host_request.cc @@ -129,7 +129,7 @@ bool RegisterSupportHostRequest::ParseResponse(const XmlElement* response, } // This method must only be called for error or result stanzas. - DCHECK_EQ(buzz::STR_RESULT, type); + DCHECK_EQ(std::string(buzz::STR_RESULT), type); const XmlElement* result_element = response->FirstNamed(QName( kChromotingXmlNamespace, kRegisterQueryResultTag)); diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc index 4bf3252..1eaf69e 100644 --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc @@ -351,7 +351,7 @@ buzz::XmlElement* JingleMessageReply::ToXml( std::string type; std::string error_text; - QName name; + QName name(""); switch (error_type) { case BAD_REQUEST: type = "modify"; |