TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

static init issues

Browse Source
This commit is contained in:
David Rose 2008-11-13 20:43:50 +00:00
parent 8f12774e74
commit 583de9fc3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/express/subStreamBuf.cxx
View File

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

4
panda/src/express/virtualFileSystem.cxx
View File

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