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

command_buffer/common/cross/cmd_buffer_format.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 49 matching lines @@
 #define O3D_COMMAND_BUFFER_COMMON_CROSS_CMD_BUFFER_FORMAT_H_
 
 #include "base/basictypes.h"
 #include "command_buffer/common/cross/types.h"
 #include "command_buffer/common/cross/bitfield_helpers.h"
 #include "core/cross/packing.h"
 
 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) {
   return static_cast<uint32>(
       (size_in_bytes + sizeof(uint32) - 1) / sizeof(uint32));  // NOLINT
 }
 
 // Rounds up to a multiple of entries in bytes.
 inline size_t RoundSizeToMultipleOfEntries(size_t size_in_bytes) {
   return ComputeNumEntries(size_in_bytes) * sizeof(uint32);  // NOLINT
@@ skipping 370 matching lines @@
 // Parameters:
 //   cmd: Address of command.
 //   size_of_data_in_bytes: Size of the data for the command.
 template <typename T>
 void* NextImmediateCmdAddress(void* cmd, uint32 size_of_data_in_bytes) {
   COMPILE_ASSERT(T::kArgFlags == cmd::kAtLeastN, Cmd_kArgFlags_not_kAtLeastN);
   return reinterpret_cast<char*>(cmd) + sizeof(T) +   // NOLINT
       RoundSizeToMultipleOfEntries(size_of_data_in_bytes);
 }
 
-enum ArgFlags {
-  kFixed = 0x0,
-  kAtLeastN = 0x1,
-};
-
 struct SharedMemory {
   void Init(uint32 _id, uint32 _offset) {
     id = _id;
     offset = _offset;
   }
 
   uint32 id;
   uint32 offset;
 };
 
@@ skipping 2812 matching lines @@
                OffsetOf_SetBackSurfaces_header_not_0);
 
 O3D_POP_STRUCTURE_PACKING;
 
 }  // namespace cmd
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_COMMON_CROSS_CMD_BUFFER_FORMAT_H_