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

Side by Side Diff: base/containers/scoped_ptr_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_map.h ('k') | no next file » | 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_map.h" 5 #include "base/containers/scoped_ptr_map.h"
6 6
7 #include <functional> 7 #include <functional>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace base { 16 namespace base {
17 namespace { 17 namespace {
18 18
19 namespace namespace_with_ignore_result {
20
21 class Value {};
22
23 template <typename T>
24 void ignore_result(const T&) {}
25
26 } // namespace namespace_with_ignore_result
27
19 // A ScopedDestroyer sets a Boolean to true upon destruction. 28 // A ScopedDestroyer sets a Boolean to true upon destruction.
20 class ScopedDestroyer { 29 class ScopedDestroyer {
21 public: 30 public:
22 ScopedDestroyer(bool* destroyed) : destroyed_(destroyed) { 31 ScopedDestroyer(bool* destroyed) : destroyed_(destroyed) {
23 *destroyed_ = false; 32 *destroyed_ = false;
24 } 33 }
25 34
26 ~ScopedDestroyer() { *destroyed_ = true; } 35 ~ScopedDestroyer() { *destroyed_ = true; }
27 36
28 private: 37 private:
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 253
245 ScopedPtrMap<int, scoped_ptr<ScopedDestroyer>> result = callback.Run(); 254 ScopedPtrMap<int, scoped_ptr<ScopedDestroyer>> result = callback.Run();
246 EXPECT_TRUE(scoped_map.empty()); 255 EXPECT_TRUE(scoped_map.empty());
247 EXPECT_EQ(elem, result.find(0)->second); 256 EXPECT_EQ(elem, result.find(0)->second);
248 EXPECT_FALSE(destroyed); 257 EXPECT_FALSE(destroyed);
249 258
250 result.clear(); 259 result.clear();
251 EXPECT_TRUE(destroyed); 260 EXPECT_TRUE(destroyed);
252 }; 261 };
253 262
263 // Test that using a value type from a namespace containing an ignore_result
264 // function compiles correctly.
265 TEST(ScopedPtrMapTest, IgnoreResultCompile) {
266 ScopedPtrMap<int, scoped_ptr<namespace_with_ignore_result::Value>> scoped_map;
267 scoped_map.insert(1,
268 make_scoped_ptr(new namespace_with_ignore_result::Value));
269 }
270
254 } // namespace 271 } // namespace
255 } // namespace base 272 } // namespace base
OLDNEW
« no previous file with comments | « base/containers/scoped_ptr_map.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698