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

Side by Side Diff: webrtc/system_wrappers/include/clock.h

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ 11 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_
12 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ 12 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" 17 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
16 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 21
20 // January 1970, in NTP seconds. 22 // January 1970, in NTP seconds.
21 const uint32_t kNtpJan1970 = 2208988800UL; 23 const uint32_t kNtpJan1970 = 2208988800UL;
22 24
23 // Magic NTP fractional unit. 25 // Magic NTP fractional unit.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // Converts an NTP timestamp to a millisecond timestamp. 71 // Converts an NTP timestamp to a millisecond timestamp.
70 int64_t CurrentNtpInMilliseconds() const override; 72 int64_t CurrentNtpInMilliseconds() const override;
71 73
72 // Advance the simulated clock with a given number of milliseconds or 74 // Advance the simulated clock with a given number of milliseconds or
73 // microseconds. 75 // microseconds.
74 void AdvanceTimeMilliseconds(int64_t milliseconds); 76 void AdvanceTimeMilliseconds(int64_t milliseconds);
75 void AdvanceTimeMicroseconds(int64_t microseconds); 77 void AdvanceTimeMicroseconds(int64_t microseconds);
76 78
77 private: 79 private:
78 int64_t time_us_; 80 int64_t time_us_;
79 rtc::scoped_ptr<RWLockWrapper> lock_; 81 std::unique_ptr<RWLockWrapper> lock_;
80 }; 82 };
81 83
82 }; // namespace webrtc 84 }; // namespace webrtc
83 85
84 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ 86 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/include/aligned_malloc.h ('k') | webrtc/system_wrappers/include/data_log_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698