move all O3D specific command buffer stuff to command_buffer::o3d...

command_buffer/service/cross/gapi_decoder.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 19 matching lines @@
  */
 
 
 // This file contains the GAPI decoder class.
 
 #ifndef O3D_COMMAND_BUFFER_SERVICE_CROSS_GAPI_DECODER_H_
 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GAPI_DECODER_H_
 
 #include "core/cross/types.h"
 #include "command_buffer/service/cross/cmd_parser.h"
-#include "command_buffer/common/cross/cmd_buffer_format.h"
+#include "command_buffer/common/cross/o3d_cmd_format.h"
 
 namespace o3d {
 namespace command_buffer {
 
+class CommandBufferEngine;
+
+namespace o3d {
+
 class GAPIInterface;
-class CommandBufferEngine;
 
 // This class implements the AsyncAPIInterface interface, decoding GAPI
 // commands and sending them to a GAPI interface.
 class GAPIDecoder : public AsyncAPIInterface {
  public:
   typedef parse_error::ParseError ParseError;
 
   explicit GAPIDecoder(GAPIInterface *gapi) : gapi_(gapi), engine_(NULL) {}
   virtual ~GAPIDecoder() {}
 
@@ skipping 18 matching lines @@
   //   check fails. Return a pointer to the data otherwise.
   void *GetAddressAndCheckSize(unsigned int shm_id,
                                unsigned int offset,
                                unsigned int size);
 
   // Generate a member function prototype for each command in an automated and
   // typesafe way.
   #define O3D_COMMAND_BUFFER_CMD_OP(name) \
      ParseError Handle ## name(           \
        unsigned int arg_count,            \
-       const cmd::name& args);            \
+       const o3d::name& args);            \
 
   O3D_COMMAND_BUFFER_CMDS(O3D_COMMAND_BUFFER_CMD_OP)
 
   #undef O3D_COMMAND_BUFFER_CMD_OP
 
   GAPIInterface *gapi_;
   CommandBufferEngine *engine_;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GAPI_DECODER_H_