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

Unified Diff: content/common/host_shared_bitmap_manager.h

Issue 623383002: Align base::hash_map with C++11, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hash-1
Patch Set: clean up stale includes 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
« no previous file with comments | « chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc ('k') | content/renderer/pepper/v8_var_converter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/host_shared_bitmap_manager.h
diff --git a/content/common/host_shared_bitmap_manager.h b/content/common/host_shared_bitmap_manager.h
index 66d5396252fede03b060c316b3496f951b2114ac..71af0e36ec682a76b5e6cdc740a7859b2d1e4d4a 100644
--- a/content/common/host_shared_bitmap_manager.h
+++ b/content/common/host_shared_bitmap_manager.h
@@ -9,7 +9,6 @@
#include <set>
#include "base/basictypes.h"
-#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
#include "base/hash.h"
#include "base/memory/ref_counted.h"
@@ -20,18 +19,12 @@
#include "content/common/content_export.h"
namespace BASE_HASH_NAMESPACE {
-#if defined(COMPILER_GCC)
template <>
struct hash<cc::SharedBitmapId> {
size_t operator()(const cc::SharedBitmapId& id) const {
return base::Hash(reinterpret_cast<const char*>(id.name), sizeof(id.name));
}
};
-#elif defined(COMPILER_MSVC)
-inline std::size_t hash_value(const cc::SharedBitmapId& id) {
- return base::Hash(reinterpret_cast<const char*>(id.name), sizeof(id.name));
-}
-#endif // COMPILER
} // namespace BASE_HASH_NAMESPACE
namespace content {
« no previous file with comments | « chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc ('k') | content/renderer/pepper/v8_var_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698