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

assimp: fix build with latest version of openddl-parser lib. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/502/head
Kim Kulling 2015-03-19 12:07:16 +01:00
parent 70aafa478d
commit f7e5f3ec6b
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ static bool isIntegerType( Value::ValueType integerType ) {
} }
static DDLNode *createDDLNode( Identifier *id, OpenDDLParser *parser ) { static DDLNode *createDDLNode( Identifier *id, OpenDDLParser *parser ) {
if( nullptr == id || ddl_nullptr == parser ) { if( ddl_nullptr == id || ddl_nullptr == parser ) {
return ddl_nullptr; return ddl_nullptr;
} }
@ -132,7 +132,7 @@ OpenDDLParser::~OpenDDLParser() {
} }
void OpenDDLParser::setLogCallback( logCallback callback ) { void OpenDDLParser::setLogCallback( logCallback callback ) {
if( nullptr != callback ) { if( ddl_nullptr != callback ) {
// install user-specific log callback // install user-specific log callback
m_logCallback = callback; m_logCallback = callback;
} else { } else {
@ -607,7 +607,7 @@ char *OpenDDLParser::parseBooleanLiteral( char *in, char *end, Value **boolean )
char *OpenDDLParser::parseIntegerLiteral( char *in, char *end, Value **integer, Value::ValueType integerType ) { char *OpenDDLParser::parseIntegerLiteral( char *in, char *end, Value **integer, Value::ValueType integerType ) {
*integer = ddl_nullptr; *integer = ddl_nullptr;
if( nullptr == in || in == end ) { if( ddl_nullptr == in || in == end ) {
return in; return in;
} }
@ -705,7 +705,7 @@ char *OpenDDLParser::parseStringLiteral( char *in, char *end, Value **stringData
} }
static void createPropertyWithData( Identifier *id, Value *primData, Property **prop ) { static void createPropertyWithData( Identifier *id, Value *primData, Property **prop ) {
if( nullptr != primData ) { if( ddl_nullptr != primData ) {
( *prop ) = new Property( id ); ( *prop ) = new Property( id );
( *prop )->m_primData = primData; ( *prop )->m_primData = primData;
} }
@ -857,7 +857,7 @@ char *OpenDDLParser::parseDataArrayList( char *in, char *end, DataArrayList **da
if( *in == '{' ) { if( *in == '{' ) {
in++; in++;
Value *current( ddl_nullptr ); Value *current( ddl_nullptr );
Reference *refs( nullptr ); Reference *refs( ddl_nullptr );
DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr ); DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr );
do { do {
in = parseDataList( in, end, &current, &refs ); in = parseDataList( in, end, &current, &refs );

11
contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
View File

@ -74,7 +74,7 @@ enum NameType {
}; };
struct Name { struct Name {
NameType m_type; NameType m_type;
Identifier *m_id; Identifier *m_id;
Name( NameType type, Identifier *id ) Name( NameType type, Identifier *id )
@ -85,8 +85,8 @@ struct Name {
}; };
struct Reference { struct Reference {
size_t m_numRefs; size_t m_numRefs;
Name **m_referencedName; Name **m_referencedName;
Reference() Reference()
: m_numRefs( 0 ) : m_numRefs( 0 )
@ -166,10 +166,5 @@ struct BufferIt {
END_ODDLPARSER_NS END_ODDLPARSER_NS
#define ODDL_NO_COPYING( classname ) \
private: \
classname( const classname & ); \
classname &operator = ( const classname & );
#endif // OPENDDLPARSER_OPENDDLPARSERCOMMON_H_INC #endif // OPENDDLPARSER_OPENDDLPARSERCOMMON_H_INC