Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 namespace namespace_with_ignore_result { | |
|
danakj
2015/10/29 17:48:39
can you whitespace better here?
1 whitespace abov
Sam McNally
2015/10/30 00:18:40
Done.
| |
| 13 | |
| 14 class Value {}; | |
| 15 | |
| 16 template <typename T> | |
| 17 void ignore_result(const T&) {} | |
| 18 } | |
| 12 | 19 |
| 13 struct DeleteCounter { | 20 struct DeleteCounter { |
| 14 public: | 21 public: |
| 15 DeleteCounter() {} | 22 DeleteCounter() {} |
| 16 ~DeleteCounter() { g_delete_count++; } | 23 ~DeleteCounter() { g_delete_count++; } |
| 17 | 24 |
| 18 static void ResetCounter() { g_delete_count = 0; } | 25 static void ResetCounter() { g_delete_count = 0; } |
| 19 static int delete_count() { return g_delete_count; } | 26 static int delete_count() { return g_delete_count; } |
| 20 | 27 |
| 21 private: | 28 private: |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); | 81 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); |
| 75 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); | 82 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); |
| 76 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); | 83 map.set(key, scoped_ptr<DeleteCounter, CountingDeleter>(new DeleteCounter)); |
| 77 EXPECT_EQ(2, DeleteCounter::delete_count()); | 84 EXPECT_EQ(2, DeleteCounter::delete_count()); |
| 78 EXPECT_EQ(2, CountingDeleter::count()); | 85 EXPECT_EQ(2, CountingDeleter::count()); |
| 79 } | 86 } |
| 80 EXPECT_EQ(3, DeleteCounter::delete_count()); | 87 EXPECT_EQ(3, DeleteCounter::delete_count()); |
| 81 EXPECT_EQ(3, CountingDeleter::count()); | 88 EXPECT_EQ(3, CountingDeleter::count()); |
| 82 } | 89 } |
| 83 | 90 |
| 91 // Test that using a value type from a namespace containing an ignore_result | |
| 92 // function compiles correctly. | |
| 93 TEST(ScopedPtrHashMapTest, IgnoreResultCompile) { | |
| 94 ScopedPtrHashMap<int, scoped_ptr<namespace_with_ignore_result::Value>> | |
| 95 scoped_map; | |
| 96 scoped_map.add(1, make_scoped_ptr(new namespace_with_ignore_result::Value)); | |
| 97 } | |
| 98 | |
| 84 } // namespace | 99 } // namespace |
| 85 } // namespace base | 100 } // namespace base |
| OLD | NEW |