Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2008, 12:54:17 PM (16 years ago)
Author:
rgrieder
Message:

Test: replacing namespace network with namespace orxonox. network::packet —> orxonox::packet

Location:
code/branches/objecthierarchy/src/network/packet
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • code/branches/objecthierarchy/src/network/packet/Acknowledgement.cc

    r1907 r2112  
    3333#include "core/CoreIncludes.h"
    3434
    35 namespace network {
     35namespace orxonox {
    3636namespace packet {
    3737
    3838#define PACKET_FLAGS_ACK    0
    3939#define _PACKETID           0
    40 #define _ACKID              _PACKETID + sizeof(network::packet::ENUM::Type)
     40#define _ACKID              _PACKETID + sizeof(packet::ENUM::Type)
    4141 
    4242Acknowledgement::Acknowledgement( unsigned int id, unsigned int clientID )
    … …  
    7474
    7575} //namespace packet
    76 } //namespace network
     76} //namespace orxonox

  • code/branches/objecthierarchy/src/network/packet/Acknowledgement.h

    r1916 r2112  
    3333
    3434
    35 namespace network {
     35namespace orxonox {
    3636namespace packet {
    3737/**
    … …  
    5353
    5454} //namespace packet
    55 } //namespace network
     55} //namespace orxonox
    5656
    5757#endif

  • code/branches/objecthierarchy/src/network/packet/Chat.cc

    r1907 r2112  
    3131#include "network/Host.h"
    3232
    33 namespace network {
     33namespace orxonox {
    3434namespace packet {
    3535 
    … …  
    7777
    7878} //namespace packet
    79 } //namespace network
     79} //namespace orxonox

  • code/branches/objecthierarchy/src/network/packet/Chat.h

    r1916 r2112  
    1010#include "Packet.h"
    1111
    12 namespace network {
     12namespace orxonox {
    1313namespace packet {
    1414/**
    … …  
    3333
    3434} //namespace packet
    35 } //namespace network
     35} //namespace orxonox
    3636
    3737#endif

  • code/branches/objecthierarchy/src/network/packet/ClassID.cc

    r1907 r2112  
    3434#include <assert.h>
    3535
    36 namespace network {
     36namespace orxonox {
    3737namespace packet {
    3838
    … …  
    6868
    6969unsigned int ClassID::getSize() const{
    70   return sizeof(network::packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
     70  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t) + classNameLength_;
    7171}
    7272
    7373bool ClassID::process(){
    7474  COUT(3) << "processing classid: " << getClassID() << " name: " << (const char*)(data_+_CLASSNAME) << std::endl;
    75   orxonox::Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
     75  Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
    7676  if(id==NULL)
    7777    return false;
    … …  
    8686
    8787} //namespace packet
    88 }//namespace network
     88}//namespace orxonox

  • code/branches/objecthierarchy/src/network/packet/ClassID.h

    r1916 r2112  
    3535#include "Packet.h"
    3636
    37 namespace network {
     37namespace orxonox {
    3838namespace packet {
    3939
    … …  
    5959
    6060} //namespace packet
    61 } //namespace network
     61} //namespace orxonox
    6262
    6363#endif

  • code/branches/objecthierarchy/src/network/packet/DeleteObjects.cc

    r1907 r2112  
    3434#include <assert.h>
    3535
    36 namespace network {
     36namespace orxonox {
    3737namespace packet {
    3838
    … …  
    9595
    9696} //namespace packet
    97 } //namespace network
     97} //namespace orxonox

  • code/branches/objecthierarchy/src/network/packet/DeleteObjects.h

    r1916 r2112  
    3434
    3535
    36 namespace network {
     36namespace orxonox {
    3737namespace packet {
    3838/**
    … …  
    5555
    5656} //namespace packet
    57 } //namespace network
     57} //namespace orxonox
    5858
    5959#endif

  • code/branches/objecthierarchy/src/network/packet/Gamestate.cc

    r2111 r2112  
    3838
    3939
    40 namespace network {
     40namespace orxonox {
    4141
    4242namespace packet {
    … …  
    9393  uint8_t *mem=data_;
    9494  mem+=sizeof(GamestateHeader);
    95   orxonox::ObjectList<Synchronisable>::iterator it;
    96   for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
     95  ObjectList<Synchronisable>::iterator it;
     96  for(it = ObjectList<Synchronisable>::begin(); it; ++it){
    9797    tempsize=it->getSize(id, mode);
    9898
    … …  
    100100      // start allocate additional memory
    101101      COUT(3) << "G.St.Man: need additional memory" << std::endl;
    102       orxonox::ObjectList<Synchronisable>::iterator temp = it;
     102      ObjectList<Synchronisable>::iterator temp = it;
    103103      int addsize=tempsize;
    104104      while(++temp)
    … …  
    147147  uint8_t *mem=data_+sizeof(GamestateHeader);
    148148    // get the start of the Synchronisable list
    149   //orxonox::ObjectList<Synchronisable>::iterator it=orxonox::ObjectList<Synchronisable>::begin();
     149  //ObjectList<Synchronisable>::iterator it=ObjectList<Synchronisable>::begin();
    150150  Synchronisable *s;
    151151
    … …  
    244244  //copy and modify header
    245245#ifndef NDEBUG
    246   HEADER->crc32 = orxonox::calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
     246  HEADER->crc32 = calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
    247247#endif
    248248  *GAMESTATE_HEADER(ndata) = *HEADER;
    … …  
    281281  }
    282282#ifndef NDEBUG
    283   assert(HEADER->crc32==orxonox::calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
     283  assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
    284284#endif
    285285
    … …  
    569569  int size=0;
    570570    // get the start of the Synchronisable list
    571   orxonox::ObjectList<Synchronisable>::iterator it;
     571  ObjectList<Synchronisable>::iterator it;
    572572    // get total size of gamestate
    573   for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it)
     573  for(it = ObjectList<Synchronisable>::begin(); it; ++it)
    574574    size+=it->getSize(id, mode); // size of the actual data of the synchronisable
    575575//  size+=sizeof(GamestateHeader);
    … …  
    582582 * @return iterator pointing to the next object in the list
    583583 */
    584   void Gamestate::removeObject(orxonox::ObjectList<Synchronisable>::iterator &it) {
    585     orxonox::ObjectList<Synchronisable>::iterator temp=it;
     584  void Gamestate::removeObject(ObjectList<Synchronisable>::iterator &it) {
     585    ObjectList<Synchronisable>::iterator temp=it;
    586586    ++it;
    587587    delete  *temp;

  • code/branches/objecthierarchy/src/network/packet/Gamestate.h

    r1916 r2112  
    4040#endif
    4141
    42 namespace network {
     42namespace orxonox {
    4343
    4444namespace packet {
    … …  
    9191  private:
    9292    unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
    93     void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
     93    void removeObject(ObjectListIterator<Synchronisable> &it);
    9494    std::map<unsigned int, Synchronisable*> dataMap_;
    9595};

  • code/branches/objecthierarchy/src/network/packet/Packet.cc

    r2084 r2112  
    4646#include "core/CoreIncludes.h"
    4747
    48 namespace network{
     48namespace orxonox{
    4949
    5050namespace packet{
    … …  
    153153//  ENetPacket *temp = enetPacket_;
    154154//  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
    155   network::Host::addPacket( enetPacket_, clientID_);
     155  Host::addPacket( enetPacket_, clientID_);
    156156  return true;
    157157}
    … …  
    219219} // namespace packet
    220220
    221 } // namespace network
    222 
     221} // namespace orxonox
     222

  • code/branches/objecthierarchy/src/network/packet/Packet.h

    r2070 r2112  
    3636#include "util/Integers.h"
    3737
    38 namespace network {
     38namespace orxonox {
    3939
    4040namespace packet{
    … …  
    9898} //namespace packet
    9999
    100 } //namespace network
     100} //namespace orxonox
    101101
    102102#endif

  • code/branches/objecthierarchy/src/network/packet/Welcome.cc

    r1907 r2112  
    3636#include <assert.h>
    3737
    38 namespace network {
     38namespace orxonox {
    3939namespace packet {
    4040
    … …  
    7070
    7171unsigned int Welcome::getSize() const{
    72   return sizeof(network::packet::ENUM::Type) + 2*sizeof(uint32_t);
     72  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t);
    7373}
    7474
    … …  
    8787
    8888} //namespace packet
    89 }//namespace network
     89}//namespace orxonox

  • code/branches/objecthierarchy/src/network/packet/Welcome.h

    r1916 r2112  
    3333#include "Packet.h"
    3434
    35 namespace network {
     35namespace orxonox {
    3636namespace packet {
    3737
    … …  
    5454
    5555} //namespace packet
    56 } //namespace network
     56} //namespace orxonox
    5757
    5858#endif
Note: See TracChangeset for help on using the changeset viewer.