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

Side by Side Diff: cc/surfaces/surface_id.h

Issue 612323010: Align base::hash_map with C++11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try a different tack for C++ insanity Created 6 years, 2 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 #ifndef CC_SURFACES_SURFACE_ID_H_ 5 #ifndef CC_SURFACES_SURFACE_ID_H_
6 #define CC_SURFACES_SURFACE_ID_H_ 6 #define CC_SURFACES_SURFACE_ID_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 10
(...skipping 16 matching lines...) Expand all
27 return !(a == b); 27 return !(a == b);
28 } 28 }
29 29
30 inline bool operator<(const SurfaceId& a, const SurfaceId& b) { 30 inline bool operator<(const SurfaceId& a, const SurfaceId& b) {
31 return a.id < b.id; 31 return a.id < b.id;
32 } 32 }
33 33
34 } // namespace cc 34 } // namespace cc
35 35
36 namespace BASE_HASH_NAMESPACE { 36 namespace BASE_HASH_NAMESPACE {
37 #if defined(COMPILER_MSVC)
38 inline size_t hash_value(const cc::SurfaceId& key) {
39 return hash_value(key.id);
40 }
41 #elif defined(COMPILER_GCC)
42 template <> 37 template <>
43 struct hash<cc::SurfaceId> { 38 struct hash<cc::SurfaceId> {
44 size_t operator()(cc::SurfaceId key) const { 39 size_t operator()(cc::SurfaceId key) const {
45 return hash<uint64_t>()(key.id); 40 return hash<uint64_t>()(key.id);
46 } 41 }
47 }; 42 };
48 #else
49 #error define a hash function for your compiler
50 #endif // COMPILER
51 } // namespace BASE_HASH_NAMESPACE 43 } // namespace BASE_HASH_NAMESPACE
52 44
53 #endif // CC_SURFACES_SURFACE_ID_H_ 45 #endif // CC_SURFACES_SURFACE_ID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698