From 5877ffe39d049730251b7f49f890c820e26643fa Mon Sep 17 00:00:00 2001 From: davidben Date: Wed, 27 Jan 2016 16:29:51 -0800 Subject: Switch cc to std::unordered_*. This removes all uses of base::hash_*, BASE_HASH_NAMESPACE, and base::ScopedPtrHashMap in favor of the C++11 versions. BUG=576864, 579229 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1587283002 Cr-Commit-Position: refs/heads/master@{#371937} --- cc/surfaces/surface_manager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/surfaces/surface_manager.h') diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h index d4fc144..a3f7b9b 100644 --- a/cc/surfaces/surface_manager.h +++ b/cc/surfaces/surface_manager.h @@ -9,9 +9,9 @@ #include #include +#include #include -#include "base/containers/hash_tables.h" #include "base/macros.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" @@ -73,12 +73,12 @@ class CC_SURFACES_EXPORT SurfaceManager { // Set of SurfaceSequences that have been satisfied by a frame but not yet // waited on. - base::hash_set satisfied_sequences_; + std::unordered_set satisfied_sequences_; // Set of valid surface ID namespaces. When a namespace is removed from // this set, any remaining sequences with that namespace are considered // satisfied. - base::hash_set valid_surface_id_namespaces_; + std::unordered_set valid_surface_id_namespaces_; DISALLOW_COPY_AND_ASSIGN(SurfaceManager); }; -- cgit v1.1