diff options
| author | Erwin Jansen <jansene@google.com> | 2023-12-15 11:49:13 -0800 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2023-12-15 11:49:13 -0800 |
| commit | 3828327c300510e0d542f0e7c9a46e75363c7a96 (patch) | |
| tree | 3cecdfdd9c8114b079c2875e5c0737adb22ef0e7 /net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc | |
| parent | 6b2545f8bc9c20c375497afad71e11d271ebf705 (diff) | |
| parent | 7e6315a61994be57daaf5fc491564cd543072be4 (diff) | |
| download | webrtc-3828327c300510e0d542f0e7c9a46e75363c7a96.tar.gz | |
Partial merge of WebRTC
This is a partial merge. This is needed since we do not accept changes
to OWNER files from the chrome domain, so those cannot come in a single
merge.
Change-Id: I37473f53ec79e422e8b77761a5859ebcd73f2e3e
Diffstat (limited to 'net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc')
| -rw-r--r-- | net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc index b89f86e43e..679439d4c2 100644 --- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc +++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc @@ -18,11 +18,11 @@ #include "absl/types/optional.h" #include "api/array_view.h" -#include "net/dcsctp/common/str_join.h" #include "net/dcsctp/packet/bounded_byte_reader.h" #include "net/dcsctp/packet/bounded_byte_writer.h" #include "net/dcsctp/packet/tlv_trait.h" #include "rtc_base/logging.h" +#include "rtc_base/strings/str_join.h" #include "rtc_base/strings/string_builder.h" namespace dcsctp { @@ -83,7 +83,7 @@ void MissingMandatoryParameterCause::SerializeTo( std::string MissingMandatoryParameterCause::ToString() const { rtc::StringBuilder sb; sb << "Missing Mandatory Parameter, missing_parameter_types=" - << StrJoin(missing_parameter_types_, ","); + << webrtc::StrJoin(missing_parameter_types_, ","); return sb.Release(); } |