Align base::hash_map with C++11.

content/renderer/pepper/v8_var_converter.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/v8_var_converter.h"
 
 #include <map>
 #include <stack>
 #include <string>
 
@@ skipping 29 matching lines @@
   StackEntry(T v) : val(v), sentinel(false) {}
   T val;
   // Used to track parent nodes on the stack while traversing the graph.
   bool sentinel;
 };
 
 struct HashedHandle {
   HashedHandle(v8::Handle<v8::Object> h) : handle(h) {}
   size_t hash() const { return handle->GetIdentityHash(); }
   bool operator==(const HashedHandle& h) const { return handle == h.handle; }
-  bool operator<(const HashedHandle& h) const { return hash() < h.hash(); }

[davidben, 2014/10/02 22:53:59]

I left the other operator<'s in place because it wasn't immediately clear
whether a std::map of them would have made sense in each case...

...except this one. This one looks pretty clearly nonsense. Unless
GetIdentityHash() is secretly GetIdentityUniqueValue(), we weren't handling hash
collisions on MSVC's hash_map. It doesn't use operator==.

   v8::Handle<v8::Object> handle;
 };
 
 }  // namespace
 
 namespace BASE_HASH_NAMESPACE {
-#if defined(COMPILER_GCC)
 template <>
 struct hash<HashedHandle> {
   size_t operator()(const HashedHandle& handle) const { return handle.hash(); }
 };
-#elif defined(COMPILER_MSVC)
-inline size_t hash_value(const HashedHandle& handle) { return handle.hash(); }
-#endif
 }  // namespace BASE_HASH_NAMESPACE
 
 namespace content {
 
 namespace {
 
 // Maps PP_Var IDs to the V8 value handle they correspond to.
 typedef base::hash_map<int64_t, v8::Handle<v8::Value> > VarHandleMap;
 typedef base::hash_set<int64_t> ParentVarSet;
 
@@ skipping 536 matching lines @@
             std::string(*name_utf8, name_utf8.length()), child_var);
         DCHECK(success);
       }
     }
   }
   *result_var = root;
   return true;
 }
 
 }  // namespace content