mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 15:47:53 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
63 lines
2 KiB
C++
63 lines
2 KiB
C++
/*
|
|
* Copyright 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/jsep_ice_candidate.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "pc/webrtc_sdp.h"
|
|
|
|
namespace webrtc {
|
|
|
|
IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const std::string& sdp,
|
|
SdpParseError* error) {
|
|
JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index);
|
|
if (!jsep_ice->Initialize(sdp, error)) {
|
|
delete jsep_ice;
|
|
return NULL;
|
|
}
|
|
return jsep_ice;
|
|
}
|
|
|
|
std::unique_ptr<IceCandidateInterface> CreateIceCandidate(
|
|
const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const cricket::Candidate& candidate) {
|
|
return std::make_unique<JsepIceCandidate>(sdp_mid, sdp_mline_index,
|
|
candidate);
|
|
}
|
|
|
|
JsepIceCandidate::JsepIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index)
|
|
: sdp_mid_(sdp_mid), sdp_mline_index_(sdp_mline_index) {}
|
|
|
|
JsepIceCandidate::JsepIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const cricket::Candidate& candidate)
|
|
: sdp_mid_(sdp_mid),
|
|
sdp_mline_index_(sdp_mline_index),
|
|
candidate_(candidate) {}
|
|
|
|
JsepIceCandidate::~JsepIceCandidate() {}
|
|
|
|
bool JsepIceCandidate::Initialize(const std::string& sdp, SdpParseError* err) {
|
|
return SdpDeserializeCandidate(sdp, this, err);
|
|
}
|
|
|
|
bool JsepIceCandidate::ToString(std::string* out) const {
|
|
if (!out)
|
|
return false;
|
|
*out = SdpSerializeCandidate(*this);
|
|
return !out->empty();
|
|
}
|
|
|
|
} // namespace webrtc
|