Changeset 10765 for code/branches/cpp11_v2/src/libraries/network/packet

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/libraries/network/packet

Files:

• ClassID.cc (modified) (2 diffs)
• Gamestate.cc (modified) (2 diffs)
• Packet.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc

@@ -58 +58 @@
   for(;it != IdentifierManager::getInstance().getIdentifierByStringMap().end();++it){
     id = it->second;
-    if(id == NULL || !id->hasFactory())
+    if(id == nullptr || !id->hasFactory())
       continue;
     const std::string& classname = id->getName();
@@ -144 +144 @@
     id=ClassByString( std::string((const char*)classname) );
     orxout(internal_info, context::packets) << "processing classid: " << networkID << " name: " << classname << " id: " << id << endl;
-    if(id==NULL){
+    if(id==nullptr){
       orxout(user_error, context::packets) << "Received a bad classname" << endl;
       abort();

code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc

@@ -608 +608 @@
 
   if(dest_length==0)
-    return NULL;
+    return nullptr;
 
   uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
@@ -645 +645 @@
 
   if(dest_length==0)
-    return NULL;
+    return nullptr;
 
   uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];

code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc

@@ -122 +122 @@
   // Destroy the ENetPacket if necessary.
   // Note: For the case ENet used the callback to destroy the packet, we have already set
-  // enetPacket_ to NULL to avoid destroying it again.
+  // enetPacket_ to nullptr to avoid destroying it again.
   if (this->enetPacket_)
   {