Fixed Mac gyp build. Switched to using Chrome hash_tables.h, changed...

plugin/cross/np_v8_bridge.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 21 matching lines @@
 
 // Code relating to interoperation of V8 JavaScript engine with NPAPI.
 
 #ifndef O3D_PLUGIN_CROSS_NP_V8_BRIDGE_H_
 #define O3D_PLUGIN_CROSS_NP_V8_BRIDGE_H_
 
 #include <npapi.h>
 #include <npruntime.h>
 #include <map>
 
-#include "base/cross/std_hash.h"
+#include "base/hash_tables.h"
 #include "core/cross/error_status.h"
 #include "core/cross/service_dependency.h"
 #include "core/cross/types.h"
 
 // The XLib header files define these preprocessor macros which v8 uses as
 // identifiers. Need to undefine them before including v8.
 #ifdef None
 #undef None
 #endif
 
@@ skipping 119 matching lines @@
   void Release() {
     if (owned && object_ != NULL) {
       NPN_ReleaseObject(object_);
     }
   }
 
   mutable bool owned;
   T* object_;
 };
 
+}  // namespace o3d
+
 // Hashes an NPObject so it can be used in a hash_map.
-template <typename T>
-class NPObjectPtrHash {
- public:
-  size_t operator() (const NPObjectPtr<T>& ptr) const {
-    return o3d::base::hash<size_t>()(reinterpret_cast<size_t>(ptr.Get()));
+#if defined(COMPILER_GCC)
+namespace __gnu_cxx {
+
+template<class T>
+struct hash<o3d::NPObjectPtr<T> > {
+  std::size_t operator()(const o3d::NPObjectPtr<T>& ptr) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(ptr.Get()));
   }
 };
 
+}  // namespace __gnu_cxx
+#elif defined(COMPILER_MSVC)
+namespace stdext {
+
+template<class T>
+inline size_t hash_value(const o3d::NPObjectPtr<T>& ptr) {
+  return hash_value(reinterpret_cast<size_t>(ptr.Get()));
+}
+
+}  // namespace stdext
+#endif  // COMPILER
+
+namespace o3d {
+
 // A V8 handle that automatically disposes itself when it is destroyed. There
 // must be only one of these for each persistent handle, otherwise they might
 // be disposed more than once.
 template <typename T>
 class AutoV8Persistent : public v8::Persistent<T> {
  public:
   AutoV8Persistent() {}
 
   template <typename U>
   explicit AutoV8Persistent(const v8::Persistent<U>& rhs)
@@ skipping 161 matching lines @@
       const v8::AccessorInfo& info);
 
   static v8::Handle<v8::Value> V8CallNamedMethod(const v8::Arguments& args);
 
   static v8::Handle<v8::Value> V8CallFunction(const v8::Arguments& args);
 
   static v8::Handle<v8::Value> V8CallAsFunction(const v8::Arguments& args);
 
   NPObjectPtr<NPObject> GetNPConstructFunction(int arity);
 
-  typedef o3d::base::hash_map<NPObjectPtr<NPObject>,
-                              AutoV8Persistent<v8::Object>,
-                              NPObjectPtrHash<NPObject> > NPV8ObjectMap;
+  typedef ::base::hash_map<NPObjectPtr<NPObject>,
+                           AutoV8Persistent<v8::Object> > NPV8ObjectMap;
 
   typedef std::map<int, NPObjectPtr<NPObject> > NPConstructFunctionMap;
 
   ServiceLocator* service_locator_;
   ServiceDependency<IErrorStatus> error_status_;
   NPP npp_;
   NPObjectPtr<NPObject> global_np_object_;
   AutoV8Persistent<v8::Context> script_context_;
   AutoV8Persistent<v8::FunctionTemplate> v8_np_constructor_template_;
   AutoV8Persistent<v8::Object> function_map_;
   AutoV8Persistent<v8::Object> global_prototype_;
   NPV8ObjectMap np_v8_object_map_;
   NPObjectPtr<NPObject> np_enumerate_function_;
   NPObjectPtr<NPObject> np_is_function_function_;
   NPObjectPtr<NPObject> np_wrap_function_function_;
   NPConstructFunctionMap np_construct_functions_;
   NPIdentifier np_name_identifier_;
   NPIdentifier np_call_identifier_;
   NPIdentifier np_length_identifier_;
   NPIdentifier np_proxy_identifier_;
   NPObjectPtr<NPObject> np_empty_array_;
   DISALLOW_COPY_AND_ASSIGN(NPV8Bridge);
 };
 }  // namespace o3d
 
 #endif  // O3D_PLUGIN_CROSS_NP_V8_BRIDGE_H_