summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/files/talk/base/httpcommon.h2
-rw-r--r--third_party/libjingle/files/talk/p2p/base/candidate.h2
-rw-r--r--third_party/libjingle/files/talk/p2p/base/stunrequest.cc2
-rw-r--r--third_party/libjingle/files/talk/p2p/base/stunrequest.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/third_party/libjingle/files/talk/base/httpcommon.h b/third_party/libjingle/files/talk/base/httpcommon.h
index 2893933..fae39f9 100644
--- a/third_party/libjingle/files/talk/base/httpcommon.h
+++ b/third_party/libjingle/files/talk/base/httpcommon.h
@@ -169,7 +169,7 @@ bool HttpHasNthAttribute(HttpAttributeList& attributes,
// Convert RFC1123 date (DoW, DD Mon YYYY HH:MM:SS TZ) to unix timestamp
bool HttpDateToSeconds(const std::string& date, unsigned long* seconds);
-inline const uint16 UrlDefaultPort(bool secure) {
+inline uint16 UrlDefaultPort(bool secure) {
return secure ? HTTP_SECURE_PORT : HTTP_DEFAULT_PORT;
}
diff --git a/third_party/libjingle/files/talk/p2p/base/candidate.h b/third_party/libjingle/files/talk/p2p/base/candidate.h
index ac41311..bc88a42 100644
--- a/third_party/libjingle/files/talk/p2p/base/candidate.h
+++ b/third_party/libjingle/files/talk/p2p/base/candidate.h
@@ -49,7 +49,7 @@ public:
void set_address(const talk_base::SocketAddress & address)
{ address_ = address; }
- const float preference() const { return preference_; }
+ float preference() const { return preference_; }
void set_preference(const float preference) { preference_ = preference; }
const std::string preference_str() const {
std::ostringstream ost;
diff --git a/third_party/libjingle/files/talk/p2p/base/stunrequest.cc b/third_party/libjingle/files/talk/p2p/base/stunrequest.cc
index 66b8ef6..a4cbe7b 100644
--- a/third_party/libjingle/files/talk/p2p/base/stunrequest.cc
+++ b/third_party/libjingle/files/talk/p2p/base/stunrequest.cc
@@ -146,7 +146,7 @@ StunRequest::~StunRequest() {
delete msg_;
}
-const StunMessageType StunRequest::type() {
+StunMessageType StunRequest::type() {
assert(msg_);
return msg_->type();
}
diff --git a/third_party/libjingle/files/talk/p2p/base/stunrequest.h b/third_party/libjingle/files/talk/p2p/base/stunrequest.h
index b36861c..c3d79f9 100644
--- a/third_party/libjingle/files/talk/p2p/base/stunrequest.h
+++ b/third_party/libjingle/files/talk/p2p/base/stunrequest.h
@@ -88,7 +88,7 @@ public:
const std::string& id() { return id_; }
// Returns the STUN type of the request message.
- const StunMessageType type();
+ StunMessageType type();
// Handles messages for sending and timeout.
void OnMessage(talk_base::Message* pmsg);