From 583de9fc3e219bb72b8c426440f953fe808a4b3a Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 13 Nov 2008 20:43:50 +0000 Subject: [PATCH] static init issues --- panda/src/express/subStreamBuf.cxx | 2 +- panda/src/express/virtualFileSystem.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/express/subStreamBuf.cxx b/panda/src/express/subStreamBuf.cxx index 4e2caf7681..a460e3f585 100644 --- a/panda/src/express/subStreamBuf.cxx +++ b/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); diff --git a/panda/src/express/virtualFileSystem.cxx b/panda/src/express/virtualFileSystem.cxx index fd71bf16a4..6531ed48db 100644 --- a/panda/src/express/virtualFileSystem.cxx +++ b/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 =