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

Unified Diff: cc/quads/render_pass.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 side-by-side diff with in-line comments
Download patch
Index: cc/quads/render_pass.h
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index db42faf1e3ffa5cf2aeddc509116bc1f8a196314..2369cdfcf747b027f9de8771aad605384f3ac8da 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -130,20 +130,12 @@ class CC_EXPORT RenderPass {
} // namespace cc
namespace BASE_HASH_NAMESPACE {
-#if defined(COMPILER_MSVC)
-inline size_t hash_value(const cc::RenderPassId& key) {
- return base::HashPair(key.layer_id, key.index);
-}
-#elif defined(COMPILER_GCC)
template <>
struct hash<cc::RenderPassId> {
size_t operator()(cc::RenderPassId key) const {
return base::HashPair(key.layer_id, key.index);
}
};
-#else
-#error define a hash function for your compiler
-#endif // COMPILER
} // namespace BASE_HASH_NAMESPACE
namespace cc {

Powered by Google App Engine
This is Rietveld 408576698