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

plugin/cross/o3d_glue.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 34 matching lines @@
 #include <X11/Intrinsic.h>
 #include <gtk/gtk.h>
 #endif
 
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 #include "base/scoped_ptr.h"
-#include "base/cross/std_hash.h"
+#include "base/hash_tables.h"
 #include "core/cross/display_mode.h"
 #include "core/cross/display_window.h"
 #include "core/cross/object_base.h"
 #include "core/cross/service_locator.h"
 #include "core/cross/evaluation_counter.h"
 #include "core/cross/class_manager.h"
 #include "core/cross/client_info.h"
 #include "core/cross/cursor.h"
 #include "core/cross/features.h"
 #include "core/cross/object_manager.h"
 #include "core/cross/error.h"
 #include "core/cross/profiler.h"
 #include "plugin/cross/main_thread_task_poster.h"
 #include "plugin/cross/np_v8_bridge.h"
 #include "client_glue.h"
 #include "third_party/nixysa/static_glue/npapi/common.h"
 
 namespace o3d {
 class Client;
 class Renderer;
 }
 
+// Hashes the NPClass and ObjectBase types so they can be used in a hash_map.
+#if defined(COMPILER_GCC)
+namespace __gnu_cxx {
+
+template<>
+struct hash<NPClass*> {
+  std::size_t operator()(NPClass* const& ptr) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(ptr));
+  }
+};
+
+template<>
+struct hash<const o3d::ObjectBase::Class*> {
+  std::size_t operator()(const o3d::ObjectBase::Class* const& ptr) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(ptr));
+  }
+};
+
+}  // namespace __gnu_cxx
+#elif defined(COMPILER_MSVC)
+namespace stdext {
+
+template<>
+inline size_t hash_value(NPClass* const& ptr) {
+  return hash_value(reinterpret_cast<size_t>(ptr));
+}
+
+template<>
+inline size_t hash_value(const o3d::ObjectBase::Class* const& ptr) {
+  return hash_value(reinterpret_cast<size_t>(ptr));
+}
+
+}  // namespace stdext
+#endif  // COMPILER
+
 namespace glue {
 class StreamManager;
 
 namespace _o3d {
 using o3d::Id;
 using o3d::ObjectBase;
 using o3d::Client;
 using o3d::ClassManager;
 using o3d::ClientInfoManager;
 using o3d::EvaluationCounter;
@@ skipping 24 matching lines @@
 NPAPIObject *GetNPObject(NPP npp, ObjectBase *object);
 NPObject *Allocate(NPP npp, NPClass *npclass);
 void Deallocate(NPObject *object);
 ServiceLocator *GetServiceLocator(NPP npp);
 Client *GetClient(NPP npp);
 void InitializeGlue(NPP npp);
 
 typedef glue::namespace_o3d::class_Client::NPAPIObject ClientNPObject;
 
 class PluginObject: public NPObject {
-  typedef o3d::base::hash_map<Id, NPAPIObject *> ClientObjectMap;
-  typedef o3d::base::hash_map<const ObjectBase::Class *, NPClass *>
+  typedef ::base::hash_map<Id, NPAPIObject *> ClientObjectMap;
+  typedef ::base::hash_map<const ObjectBase::Class *, NPClass *>
       ClientToNPClassMap;
-  typedef o3d::base::hash_map<NPClass *, const ObjectBase::Class *>
+  typedef ::base::hash_map<NPClass *, const ObjectBase::Class *>
       NPToClientClassMap;
 
   NPP npp_;
   ServiceLocator service_locator_;
   EvaluationCounter evaluation_counter_;
   ClassManager class_manager_;
   ClientInfoManager client_info_manager_;
   ObjectManager object_manager_;
   Profiler profiler_;
   MainThreadTaskPoster main_thread_task_poster_;
@@ skipping 290 matching lines @@
   HCURSOR hCursor_;
   bool painted_once_;
 #endif  // OS_WIN
 };
 
 }  // namespace o3d
 }  // namespace glue
 
 
 #endif  // O3D_PLUGIN_CROSS_O3D_GLUE_H_