From f7e5f3ec6b345b0f13bc0170bc7ce7c4c9c34027 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 19 Mar 2015 12:07:16 +0100
Subject: [PATCH] assimp: fix build with latest version of openddl-parser lib.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
---
 contrib/openddlparser/code/OpenDDLParser.cpp          | 10 +++++-----
 .../include/openddlparser/OpenDDLCommon.h             | 11 +++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/contrib/openddlparser/code/OpenDDLParser.cpp b/contrib/openddlparser/code/OpenDDLParser.cpp
index 99274f412..1050baeb4 100644
--- a/contrib/openddlparser/code/OpenDDLParser.cpp
+++ b/contrib/openddlparser/code/OpenDDLParser.cpp
@@ -81,7 +81,7 @@ static bool isIntegerType( Value::ValueType integerType ) {
 }
 
 static DDLNode *createDDLNode( Identifier *id, OpenDDLParser *parser ) {
-    if( nullptr == id || ddl_nullptr == parser ) {
+    if( ddl_nullptr == id || ddl_nullptr == parser ) {
         return ddl_nullptr;
     }
 
@@ -132,7 +132,7 @@ OpenDDLParser::~OpenDDLParser() {
 }
 
 void OpenDDLParser::setLogCallback( logCallback callback ) {
-    if( nullptr != callback ) {
+    if( ddl_nullptr != callback ) {
         // install user-specific log callback
         m_logCallback = callback;
     } 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 ) {
     *integer = ddl_nullptr;
-    if( nullptr == in || in == end ) {
+    if( ddl_nullptr == in || in == end ) {
         return in;
     }
 
@@ -705,7 +705,7 @@ char *OpenDDLParser::parseStringLiteral( char *in, char *end, Value **stringData
 }
 
 static void createPropertyWithData( Identifier *id, Value *primData, Property **prop ) {
-    if( nullptr != primData ) {
+    if( ddl_nullptr != primData ) {
         ( *prop ) = new Property( id );
         ( *prop )->m_primData = primData;
     }
@@ -857,7 +857,7 @@ char *OpenDDLParser::parseDataArrayList( char *in, char *end, DataArrayList **da
     if( *in == '{' ) {
         in++;
         Value *current( ddl_nullptr );
-        Reference *refs( nullptr );
+        Reference *refs( ddl_nullptr );
         DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr );
         do {
             in = parseDataList( in, end, &current, &refs );
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h b/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
index 87209af86..40e54ea4b 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
@@ -74,7 +74,7 @@ enum NameType {
 };
 
 struct Name {
-    NameType m_type;
+    NameType    m_type;
     Identifier *m_id;
 
     Name( NameType type, Identifier *id )
@@ -85,8 +85,8 @@ struct Name {
 };
 
 struct Reference {
-    size_t m_numRefs;
-    Name **m_referencedName;
+    size_t   m_numRefs;
+    Name   **m_referencedName;
 
     Reference()
     : m_numRefs( 0 )
@@ -166,10 +166,5 @@ struct BufferIt {
 
 END_ODDLPARSER_NS
 
-#define ODDL_NO_COPYING( classname ) \
-private: \
-    classname( const classname & ); \
-    classname &operator = ( const classname & );
-
 #endif // OPENDDLPARSER_OPENDDLPARSERCOMMON_H_INC