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

Side by Side Diff: base/containers/scoped_ptr_hash_map_unittest.cc

Issue 1423663010: Change ScopedPtr(Hash)Map to make qualified calls to ignore_result(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix whitespace Created 5 years, 1 month 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
« no previous file with comments | « base/containers/scoped_ptr_hash_map.h ('k') | base/containers/scoped_ptr_map.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/containers/scoped_ptr_hash_map.h" 5 #include "base/containers/scoped_ptr_hash_map.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 namespace base { 10 namespace base {
11 namespace { 11 namespace {
12 12
13 namespace namespace_with_ignore_result {
14
15 class Value {};
16
17 template <typename T>
18 void ignore_result(const T&) {}
19
20 } // namespace namespace_with_ignore_result
21
13 struct DeleteCounter { 22 struct DeleteCounter {
14 public: 23 public:
15 DeleteCounter() {} 24 DeleteCounter() {}
16 ~DeleteCounter() { g_delete_count++; } 25 ~DeleteCounter() { g_delete_count++; }
17 26
18 static void ResetCounter() { g_delete_count = 0; } 27 static void ResetCounter() { g_delete_count = 0; }
19 static int delete_count() { return g_delete_count; } 28 static int delete_count() { return g_delete_count; }
20 29
21 private: 30 private:
22 static int g_delete_count; 31 static int g_delete_count;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); 83 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter));
75 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); 84 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter));
76 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); 85 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter));
77 EXPECT_EQ(2, DeleteCounter::delete_count()); 86 EXPECT_EQ(2, DeleteCounter::delete_count());
78 EXPECT_EQ(2, CountingDeleter::count()); 87 EXPECT_EQ(2, CountingDeleter::count());
79 } 88 }
80 EXPECT_EQ(3, DeleteCounter::delete_count()); 89 EXPECT_EQ(3, DeleteCounter::delete_count());
81 EXPECT_EQ(3, CountingDeleter::count()); 90 EXPECT_EQ(3, CountingDeleter::count());
82 } 91 }
83 92
93 // Test that using a value type from a namespace containing an ignore_result
94 // function compiles correctly.
95 TEST(ScopedPtrHashMapTest, IgnoreResultCompile) {
96 ScopedPtrHashMap<int, scoped_ptr<namespace_with_ignore_result::Value>>
97 scoped_map;
98 scoped_map.add(1, make_scoped_ptr(new namespace_with_ignore_result::Value));
99 }
100
84 } // namespace 101 } // namespace
85 } // namespace base 102 } // namespace base
OLDNEW
« no previous file with comments | « base/containers/scoped_ptr_hash_map.h ('k') | base/containers/scoped_ptr_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698