From 5bb35f3af6e8830bc0a590691a6acc72bc6d4f76 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 20 Dec 2016 17:27:36 +0100 Subject: [PATCH] Replace use of nullptr in headers with NULL --- include/assimp/anim.h | 4 ++-- include/assimp/metadata.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/assimp/anim.h b/include/assimp/anim.h index 2a0b0e06e..f88faa22e 100644 --- a/include/assimp/anim.h +++ b/include/assimp/anim.h @@ -377,9 +377,9 @@ struct aiAnimation { : mDuration(-1.) , mTicksPerSecond(0.) , mNumChannels(0) - , mChannels(nullptr) + , mChannels(NULL) , mNumMeshChannels(0) - , mMeshChannels(nullptr) { + , mMeshChannels(NULL) { // empty } diff --git a/include/assimp/metadata.h b/include/assimp/metadata.h index 78b214581..53eb9ecf0 100644 --- a/include/assimp/metadata.h +++ b/include/assimp/metadata.h @@ -187,7 +187,7 @@ struct aiMetadata { static inline aiMetadata *Alloc( unsigned int numProperties ) { if ( 0 == numProperties ) { - return nullptr; + return NULL; } aiMetadata *data = new aiMetadata;