Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: webrtc/call/rtc_event_log.cc

Issue 1789903003: Replace scoped_ptr with unique_ptr in webrtc/call/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/call/rtc_event_log.cc
diff --git a/webrtc/call/rtc_event_log.cc b/webrtc/call/rtc_event_log.cc
index 361db81c068ccc99b480918ad55c05cbd1be1656..ce4d6ef39f4b4e3fb86173d055ee526f9da8933d 100644
--- a/webrtc/call/rtc_event_log.cc
+++ b/webrtc/call/rtc_event_log.cc
@@ -105,8 +105,8 @@ class RtcEventLogImpl final : public RtcEventLog {
EXCLUSIVE_LOCKS_REQUIRED(crit_);
rtc::CriticalSection crit_;
- rtc::scoped_ptr<FileWrapper> file_ GUARDED_BY(crit_) =
- rtc::scoped_ptr<FileWrapper>(FileWrapper::Create());
+ std::unique_ptr<FileWrapper> file_ GUARDED_BY(crit_) =
+ std::unique_ptr<FileWrapper>(FileWrapper::Create());
the sun 2016/03/12 11:51:13 Is make_unique() C++14 or C++17?
kwiberg-webrtc 2016/03/12 14:06:46 C++14. Although it wouldn't be of any use here, wo
kwiberg-webrtc 2016/03/12 14:10:05 No, auto can’t be used here. This is a class defin
rtc::PlatformFile platform_file_ GUARDED_BY(crit_) =
rtc::kInvalidPlatformFileValue;
rtclog::EventStream stream_ GUARDED_BY(crit_);
@@ -501,7 +501,7 @@ bool RtcEventLog::ParseRtcEventLog(const std::string& file_name,
rtclog::EventStream* result) {
char tmp_buffer[1024];
int bytes_read = 0;
- rtc::scoped_ptr<FileWrapper> dump_file(FileWrapper::Create());
+ std::unique_ptr<FileWrapper> dump_file(FileWrapper::Create());
if (dump_file->OpenFile(file_name.c_str(), true) != 0) {
return false;
}
@@ -516,8 +516,8 @@ bool RtcEventLog::ParseRtcEventLog(const std::string& file_name,
#endif // ENABLE_RTC_EVENT_LOG
// RtcEventLog member functions.
-rtc::scoped_ptr<RtcEventLog> RtcEventLog::Create() {
- return rtc::scoped_ptr<RtcEventLog>(new RtcEventLogImpl());
+std::unique_ptr<RtcEventLog> RtcEventLog::Create() {
+ return std::unique_ptr<RtcEventLog>(new RtcEventLogImpl());
}
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698