zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::nullptr_t instead of decltype(nullptr)

Browse Source 
Review URL: https://codereview.webrtc.org/1531173003

Cr-Commit-Position: refs/heads/master@{#11068}
This commit is contained in:
kwiberg
2015-12-17 06:20:27 -08:00
committed by Commit bot
parent 1e0cfd9a46
commit 9390f84a4a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/base/scoped_ptr.h
View File

@ -87,6 +87,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> // For std::swap(). #include <algorithm> // For std::swap().
#include <cstddef>
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
#include "webrtc/base/template_util.h" #include "webrtc/base/template_util.h"
@ -326,7 +327,7 @@ class scoped_ptr {
scoped_ptr(element_type* p, const D& d) : impl_(p, d) {} scoped_ptr(element_type* p, const D& d) : impl_(p, d) {}
// Constructor. Allows construction from a nullptr. // Constructor. Allows construction from a nullptr.
scoped_ptr(decltype(nullptr)) : impl_(nullptr) {} scoped_ptr(std::nullptr_t) : impl_(nullptr) {}
// Constructor. Allows construction from a scoped_ptr rvalue for a // Constructor. Allows construction from a scoped_ptr rvalue for a
// convertible type and deleter. // convertible type and deleter.
@ -363,7 +364,7 @@ class scoped_ptr {
// operator=. Allows assignment from a nullptr. Deletes the currently owned // operator=. Allows assignment from a nullptr. Deletes the currently owned
// object, if any. // object, if any.
scoped_ptr& operator=(decltype(nullptr)) { scoped_ptr& operator=(std::nullptr_t) {
reset(); reset();
return *this; return *this;
} }
@ -483,7 +484,7 @@ class scoped_ptr<T[], D> {
explicit scoped_ptr(element_type* array) : impl_(array) {} explicit scoped_ptr(element_type* array) : impl_(array) {}
// Constructor. Allows construction from a nullptr. // Constructor. Allows construction from a nullptr.
scoped_ptr(decltype(nullptr)) : impl_(nullptr) {} scoped_ptr(std::nullptr_t) : impl_(nullptr) {}
// Constructor. Allows construction from a scoped_ptr rvalue. // Constructor. Allows construction from a scoped_ptr rvalue.
scoped_ptr(scoped_ptr&& other) : impl_(&other.impl_) {} scoped_ptr(scoped_ptr&& other) : impl_(&other.impl_) {}
@ -496,7 +497,7 @@ class scoped_ptr<T[], D> {
// operator=. Allows assignment from a nullptr. Deletes the currently owned // operator=. Allows assignment from a nullptr. Deletes the currently owned
// array, if any. // array, if any.
scoped_ptr& operator=(decltype(nullptr)) { scoped_ptr& operator=(std::nullptr_t) {
reset(); reset();
return *this; return *this;
} }