Changeset 11054 for code/branches/cpp11_v3/src/orxonox/chat/ChatInputHandler.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/chat/ChatInputHandler.cc (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/chat/ChatInputHandler.cc

@@ -79 +79 @@
     this->inpbuf = new InputBuffer();
     this->disp_offset = 0;
-    assert( this->inpbuf != NULL );
+    assert( this->inpbuf != nullptr );
 
     /* generate chatbox ui and chatbox-inputonly ui */