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

Unified Diff: mojo/public/cpp/bindings/lib/interface_ptr_internal.h

Issue 613053002: Mojo: NULL -> nullptr in mojo/public/cpp/bindings and also for the bindings generator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « mojo/public/cpp/bindings/lib/interface_impl_internal.h ('k') | mojo/public/cpp/bindings/lib/message.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/lib/interface_ptr_internal.h
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
index 7e9a26286a7637ccc2d5d2bce2ff641139540aa4..77386faf63124034d3c019763fa69e20c5f2cef6 100644
--- a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
+++ b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
@@ -20,7 +20,7 @@ namespace internal {
template <typename Interface>
class InterfacePtrState {
public:
- InterfacePtrState() : proxy_(NULL), router_(NULL), waiter_(NULL) {}
+ InterfacePtrState() : proxy_(nullptr), router_(nullptr), waiter_(nullptr) {}
~InterfacePtrState() {
// Destruction order matters here. We delete |proxy_| first, even though
@@ -33,7 +33,7 @@ class InterfacePtrState {
Interface* instance() {
ConfigureProxyIfNecessary();
- // This will be NULL if the object is not bound.
+ // This will be null if the object is not bound.
return proxy_;
}
@@ -65,7 +65,7 @@ class InterfacePtrState {
if (router_)
return router_->PassMessagePipe();
- waiter_ = NULL;
+ waiter_ = nullptr;
return handle_.Pass();
}
@@ -125,7 +125,7 @@ class InterfacePtrState {
filters.Append<typename Interface::ResponseValidator_>();
router_ = new Router(handle_.Pass(), filters.Pass(), waiter_);
- waiter_ = NULL;
+ waiter_ = nullptr;
ProxyWithStub* proxy = new ProxyWithStub(router_);
router_->set_incoming_receiver(&proxy->stub);
« no previous file with comments | « mojo/public/cpp/bindings/lib/interface_impl_internal.h ('k') | mojo/public/cpp/bindings/lib/message.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698