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

how hash functions are specified for certain key types, and deleted
our std_hash.h. Fixed forward reference bug in cmd_buffer_format.h.
Built and tested on Windows and Mac.

Remaining workarounds: enabled C++ exceptions due to use of Objective
C try/catch in plugin_mac.mm; disabled warnings as errors due to
signed / unsigned issues in command buffer code, which will probably
need to be fixed by changing typedefs and argument types.

Review URL: http://codereview.chromium.org/249013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27311 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/o3d/command_buffer/common/cross/cmd_buffer_format.h b/o3d/command_buffer/common/cross/cmd_buffer_format.h
index 63bcc8be..96e0578 100644
--- a/o3d/command_buffer/common/cross/cmd_buffer_format.h
+++ b/o3d/command_buffer/common/cross/cmd_buffer_format.h
@@ -67,6 +67,13 @@
 namespace o3d {
 namespace command_buffer {
 
+namespace cmd {
+  enum ArgFlags {
+    kFixed = 0x0,
+    kAtLeastN = 0x1,
+  };
+}  // namespace cmd
+
 // Computes the number of command buffer entries needed for a certain size. In
 // other words it rounds up to a multiple of entries.
 inline uint32 ComputeNumEntries(size_t size_in_bytes) {
@@ -457,11 +464,6 @@ void* NextImmediateCmdAddress(void* cmd, uint32 size_of_data_in_bytes) {
       RoundSizeToMultipleOfEntries(size_of_data_in_bytes);
 }
 
-enum ArgFlags {
-  kFixed = 0x0,
-  kAtLeastN = 0x1,
-};
-
 struct SharedMemory {
   void Init(uint32 _id, uint32 _offset) {
     id = _id;