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

Side by Side Diff: mojo/public/cpp/bindings/tests/container_test_util.cc

Issue 828373008: Allow constructing {Interface,Struct}Ptr from nullptr (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/public/cpp/bindings/tests/container_test_util.h" 5 #include "mojo/public/cpp/bindings/tests/container_test_util.h"
6 6
7 namespace mojo { 7 namespace mojo {
8 8
9 size_t CopyableType::num_instances_ = 0; 9 size_t CopyableType::num_instances_ = 0;
10 size_t MoveOnlyType::num_instances_ = 0; 10 size_t MoveOnlyType::num_instances_ = 0;
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 CopyableType::~CopyableType() { 27 CopyableType::~CopyableType() {
28 num_instances_--; 28 num_instances_--;
29 } 29 }
30 30
31 MoveOnlyType::MoveOnlyType() : moved_(false), ptr_(this) { 31 MoveOnlyType::MoveOnlyType() : moved_(false), ptr_(this) {
32 num_instances_++; 32 num_instances_++;
33 } 33 }
34 34
35 MoveOnlyType::MoveOnlyType(RValue other) 35 MoveOnlyType::MoveOnlyType(MoveOnlyType&& other)
36 : moved_(true), ptr_(other.object->ptr()) { 36 : moved_(true), ptr_(other.ptr()) {
37 num_instances_++; 37 num_instances_++;
38 } 38 }
39 39
40 MoveOnlyType& MoveOnlyType::operator=(RValue other) { 40 MoveOnlyType& MoveOnlyType::operator=(MoveOnlyType&& other) {
41 moved_ = true; 41 moved_ = true;
42 ptr_ = other.object->ptr(); 42 ptr_ = other.ptr();
43 return *this; 43 return *this;
44 } 44 }
45 45
46 MoveOnlyType::~MoveOnlyType() { 46 MoveOnlyType::~MoveOnlyType() {
47 num_instances_--; 47 num_instances_--;
48 } 48 }
49 49
50 } // namespace mojo 50 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698