Browse Source

Replace use of nullptr in headers with NULL

rdb 8 years ago
parent
commit
5bb35f3af6
2 changed files with 3 additions and 3 deletions
  1. 2 2
      include/assimp/anim.h
  2. 1 1
      include/assimp/metadata.h

+ 2 - 2
include/assimp/anim.h

@@ -377,9 +377,9 @@ struct aiAnimation {
     : mDuration(-1.)
     : mDuration(-1.)
     , mTicksPerSecond(0.)
     , mTicksPerSecond(0.)
     , mNumChannels(0)
     , mNumChannels(0)
-    , mChannels(nullptr)
+    , mChannels(NULL)
     , mNumMeshChannels(0)
     , mNumMeshChannels(0)
-    , mMeshChannels(nullptr) {
+    , mMeshChannels(NULL) {
         // empty
         // empty
     }
     }
 
 

+ 1 - 1
include/assimp/metadata.h

@@ -187,7 +187,7 @@ struct aiMetadata {
     static inline
     static inline
     aiMetadata *Alloc( unsigned int numProperties ) {
     aiMetadata *Alloc( unsigned int numProperties ) {
         if ( 0 == numProperties ) {
         if ( 0 == numProperties ) {
-            return nullptr;
+            return NULL;
         }
         }
 
 
         aiMetadata *data = new aiMetadata;
         aiMetadata *data = new aiMetadata;