- Timestamp:
- Nov 6, 2015, 10:54:34 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc
r10765 r10768 69 69 packetDirection_ = Direction::Outgoing; 70 70 peerID_=0; 71 data_= 0;72 enetPacket_= 0;71 data_=nullptr; 72 enetPacket_=nullptr; 73 73 bDataENetAllocated_ = false; 74 74 } … … 80 80 peerID_=peerID; 81 81 data_=data; 82 enetPacket_= 0;82 enetPacket_=nullptr; 83 83 bDataENetAllocated_ = false; 84 84 } … … 95 95 memcpy(data_, p.data_, p.getSize()); 96 96 }else 97 data_= 0;97 data_=nullptr; 98 98 bDataENetAllocated_ = p.bDataENetAllocated_; 99 99 } … … 175 175 #endif 176 176 // ENetPacket *temp = enetPacket_; 177 // enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet177 // enetPacket_ = nullptr; // otherwise we have a double free because enet already handles the deallocation of the packet 178 178 if( this->flags_ & PacketFlag::Reliable ) 179 179 host->addPacket( enetPacket_, peerID_, NETWORK_CHANNEL_DEFAULT); … … 191 191 // if( peerID==static_cast<unsigned int>(-2)) 192 192 // peerID = NETWORK_PEER_ID_SERVER; 193 Packet *p = 0;193 Packet *p = nullptr; 194 194 // orxout(verbose_ultra, context::packets) << "packet type: " << *(Type::Value *)&data[_PACKETID] << endl; 195 195 switch( *(Type::Value *)(data + _PACKETID) ) … … 251 251 assert(it != packetMap_.end()); 252 252 // Make sure we don't delete it again in the destructor 253 it->second->enetPacket_ = 0;253 it->second->enetPacket_ = nullptr; 254 254 delete it->second; 255 255 packetMap_.erase(it);
Note: See TracChangeset
for help on using the changeset viewer.