Selaa lähdekoodia

static init issues

David Rose 17 vuotta sitten
vanhempi
sitoutus
583de9fc3e
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1 1
      panda/src/express/subStreamBuf.cxx
  2. 2 2
      panda/src/express/virtualFileSystem.cxx

+ 1 - 1
panda/src/express/subStreamBuf.cxx

@@ -252,7 +252,7 @@ underflow() {
       }
 
       // Slide what we did read to the top of the buffer.
-      nassertr(read_count < num_bytes, EOF);
+      nassertr(read_count < (int)num_bytes, EOF);
       size_t delta = num_bytes - read_count;
       memmove(gptr() + delta, gptr(), read_count);
       gbump(delta);

+ 2 - 2
panda/src/express/virtualFileSystem.cxx

@@ -112,7 +112,7 @@ bool VirtualFileSystem::
 mount(const Filename &physical_filename, const Filename &mount_point, 
       int flags, const string &password) {
   if (!physical_filename.exists()) {
-    express_cat.warning()
+    express_cat->warning()
       << "Attempt to mount " << physical_filename << ", not found.\n";
     return false;
   }
@@ -1046,7 +1046,7 @@ consider_mount_mf(const Filename &filename) {
     }
 
     multifile->set_multifile_name(dirname.get_basename());
-    express_cat.info()
+    express_cat->info()
       << "Implicitly mounting " << dirname << "\n";
 
     PT(VirtualFileMountMultifile) new_mount =