Browse Source

fixed issue that caused compiler warning

rdb 12 years ago
parent
commit
6296ed0a4e
1 changed files with 3 additions and 3 deletions
  1. 3 3
      panda/src/express/multifile.cxx

+ 3 - 3
panda/src/express/multifile.cxx

@@ -2130,8 +2130,8 @@ read_subfile(int index, pvector<unsigned char> &result) {
   result.clear();
   result.clear();
 
 
   // Now look up the particular Subfile we are reading.
   // Now look up the particular Subfile we are reading.
-  nassertr(is_read_valid(), NULL);
-  nassertr(index >= 0 && index < (int)_subfiles.size(), NULL);
+  nassertr(is_read_valid(), false);
+  nassertr(index >= 0 && index < (int)_subfiles.size(), false);
   Subfile *subfile = _subfiles[index];
   Subfile *subfile = _subfiles[index];
 
 
   if (subfile->_source != (istream *)NULL ||
   if (subfile->_source != (istream *)NULL ||
@@ -2142,7 +2142,7 @@ read_subfile(int index, pvector<unsigned char> &result) {
 
 
     // That shouldn't change the subfile index or delete the subfile
     // That shouldn't change the subfile index or delete the subfile
     // pointer.
     // pointer.
-    nassertr(subfile == _subfiles[index], NULL);
+    nassertr(subfile == _subfiles[index], false);
   }
   }
 
 
   result.reserve(subfile->_uncompressed_length);
   result.reserve(subfile->_uncompressed_length);