commit 9390f84a4a0ccaca7f3eeec55e3b111158583665
author kwiberg <kwiberg@webrtc.org> Thu Dec 17 06:20:27 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Dec 17 14:20:32 2015 +0000
tree 8ab8ba6826f702b4a6815a227b67a0f603a69f1c
parent 1e0cfd9a462185ba5c434114cf9dcaf160cd68e3

Use std::nullptr_t instead of decltype(nullptr)

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

Cr-Commit-Position: refs/heads/master@{#11068}

webrtc/base/scoped_ptr.h

diff --git a/webrtc/base/scoped_ptr.h b/webrtc/base/scoped_ptr.h
index 3b3301f..db615f3 100644
--- a/webrtc/base/scoped_ptr.h
+++ b/webrtc/base/scoped_ptr.h
@@ -87,6 +87,7 @@
 #include <stdlib.h>
 
 #include <algorithm>  // For std::swap().
+#include <cstddef>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/template_util.h"
@@ -326,7 +327,7 @@
   scoped_ptr(element_type* p, const D& d) : impl_(p, d) {}
 
   // 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
   // convertible type and deleter.
@@ -363,7 +364,7 @@
 
   // operator=.  Allows assignment from a nullptr. Deletes the currently owned
   // object, if any.
-  scoped_ptr& operator=(decltype(nullptr)) {
+  scoped_ptr& operator=(std::nullptr_t) {
     reset();
     return *this;
   }
@@ -483,7 +484,7 @@
   explicit scoped_ptr(element_type* array) : impl_(array) {}
 
   // 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.
   scoped_ptr(scoped_ptr&& other) : impl_(&other.impl_) {}
@@ -496,7 +497,7 @@
 
   // operator=.  Allows assignment from a nullptr. Deletes the currently owned
   // array, if any.
-  scoped_ptr& operator=(decltype(nullptr)) {
+  scoped_ptr& operator=(std::nullptr_t) {
     reset();
     return *this;
   }