| Index: mojo/public/cpp/bindings/lib/router.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/router.cc b/mojo/public/cpp/bindings/lib/router.cc
|
| index 5355faf7477c29ca23f4695b9c998c0dc0417b72..34788404d0fba90a513ad118b81d4a9da8901a57 100644
|
| --- a/mojo/public/cpp/bindings/lib/router.cc
|
| +++ b/mojo/public/cpp/bindings/lib/router.cc
|
| @@ -58,7 +58,7 @@ Router::Router(ScopedMessagePipeHandle message_pipe,
|
| filters_(filters.Pass()),
|
| connector_(message_pipe.Pass(), waiter),
|
| weak_self_(this),
|
| - incoming_receiver_(NULL),
|
| + incoming_receiver_(nullptr),
|
| next_request_id_(0),
|
| testing_mode_(false) {
|
| filters_.SetSink(&thunk_);
|
| @@ -66,7 +66,7 @@ Router::Router(ScopedMessagePipeHandle message_pipe,
|
| }
|
|
|
| Router::~Router() {
|
| - weak_self_.set_value(NULL);
|
| + weak_self_.set_value(nullptr);
|
|
|
| for (ResponderMap::const_iterator i = responders_.begin();
|
| i != responders_.end(); ++i) {
|
|
|