1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Description: Fix build against absl::string_view from Debian package
absl::string_view can't be implicitly converted to std::string
Author: Nicholas Guriev <guriev-ns@ya.ru>
Last-Update: Wed, 06 Nov 2024 19:31:23 +0300
--- a/src/api/transport/stun.cc
+++ b/src/api/transport/stun.cc
@@ -620,7 +620,7 @@ bool StunMessage::Read(ByteBufferReader*
if (rtc::NetworkToHost32(magic_cookie_int) != kStunMagicCookie) {
// If magic cookie is invalid it means that the peer implements
// RFC3489 instead of RFC5389.
- transaction_id.insert(0, magic_cookie);
+ transaction_id.insert(0, magic_cookie.data(), magic_cookie.size());
}
RTC_DCHECK(IsValidTransactionId(transaction_id));
transaction_id_ = transaction_id;
--- a/src/pc/rtc_stats_collector.cc
+++ b/src/pc/rtc_stats_collector.cc
@@ -985,7 +985,7 @@ const std::string& ProduceIceCandidateSt
candidate_stats->address = candidate.address().ipaddr().ToString();
candidate_stats->port = static_cast<int32_t>(candidate.address().port());
candidate_stats->protocol = candidate.protocol();
- candidate_stats->candidate_type = candidate.type_name();
+ candidate_stats->candidate_type = static_cast<std::string>(candidate.type_name());
candidate_stats->priority = static_cast<int32_t>(candidate.priority());
candidate_stats->foundation = candidate.foundation();
auto related_address = candidate.related_address();
--- a/src/rtc_base/experiments/alr_experiment.cc
+++ b/src/rtc_base/experiments/alr_experiment.cc
@@ -22,7 +22,7 @@
namespace webrtc {
namespace {
-constexpr absl::string_view kDefaultProbingScreenshareBweSettings =
+constexpr std::string_view kDefaultProbingScreenshareBweSettings =
"1.0,2875,80,40,-60,3";
} // namespace
|
