v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix usage of c++11 type nullptr. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/502/head
Kim Kulling 2015-03-19 12:14:17 +01:00
parent f7e5f3ec6b
commit 40369010c3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/openddlparser/code/OpenDDLParser.cpp
View File

@ -218,7 +218,7 @@ static void dumpId( Identifier *id ) {
} }
char *OpenDDLParser::parseHeader( char *in, char *end ) { char *OpenDDLParser::parseHeader( char *in, char *end ) {
if( nullptr == in || in == end ) { if( ddl_nullptr == in || in == end ) {
return in; return in;
} }
@ -259,7 +259,7 @@ char *OpenDDLParser::parseHeader( char *in, char *end ) {
// store the node // store the node
DDLNode *node( createDDLNode( id, this ) ); DDLNode *node( createDDLNode( id, this ) );
if( nullptr != node ) { if( ddl_nullptr != node ) {
pushNode( node ); pushNode( node );
} else { } else {
std::cerr << "nullptr returned by creating DDLNode." << std::endl; std::cerr << "nullptr returned by creating DDLNode." << std::endl;
@ -282,7 +282,7 @@ char *OpenDDLParser::parseHeader( char *in, char *end ) {
} }
char *OpenDDLParser::parseStructure( char *in, char *end ) { char *OpenDDLParser::parseStructure( char *in, char *end ) {
if( nullptr == in || in == end ) { if( ddl_nullptr == in || in == end ) {
return in; return in;
} }
@ -377,7 +377,7 @@ char *OpenDDLParser::parseStructureBody( char *in, char *end, bool &error ) {
} }
void OpenDDLParser::pushNode( DDLNode *node ) { void OpenDDLParser::pushNode( DDLNode *node ) {
if( nullptr == node ) { if( ddl_nullptr == node ) {
return; return;
} }
@ -405,7 +405,7 @@ DDLNode *OpenDDLParser::top() {
} }
DDLNode *OpenDDLParser::getRoot() const { DDLNode *OpenDDLParser::getRoot() const {
if( nullptr == m_context ) { if( ddl_nullptr == m_context ) {
return ddl_nullptr; return ddl_nullptr;
} }
@ -766,7 +766,7 @@ char *OpenDDLParser::parseProperty( char *in, char *end, Property **prop ) {
in = getNextToken( in, end ); in = getNextToken( in, end );
Identifier *id( ddl_nullptr ); Identifier *id( ddl_nullptr );
in = parseIdentifier( in, end, &id ); in = parseIdentifier( in, end, &id );
if( nullptr != id ) { if( ddl_nullptr != id ) {
in = getNextToken( in, end ); in = getNextToken( in, end );
if( *in == '=' ) { if( *in == '=' ) {
in++; in++;