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

osx build error

Browse Source
This commit is contained in:
David Rose 2013-08-01 06:43:02 +00:00
parent dba661253a
commit c63fe6f56d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/putil/datagramOutputFile.cxx
View File

@ -15,6 +15,7 @@
#include "datagramOutputFile.h" #include "datagramOutputFile.h"
#include "streamWriter.h" #include "streamWriter.h"
#include "zStream.h" #include "zStream.h"
#include <algorithm>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: DatagramOutputFile::open // Function: DatagramOutputFile::open
@ -183,7 +184,7 @@ copy_datagram(SubfileInfo &result, const Filename &filename) {
char buffer[buffer_size]; char buffer[buffer_size];
streampos start = _out->tellp(); streampos start = _out->tellp();
in->read(buffer, min(buffer_size, num_remaining)); in->read(buffer, min((streamsize)buffer_size, num_remaining));
streamsize count = in->gcount(); streamsize count = in->gcount();
while (count != 0) { while (count != 0) {
_out->write(buffer, count); _out->write(buffer, count);
@ -195,7 +196,7 @@ copy_datagram(SubfileInfo &result, const Filename &filename) {
if (num_remaining == 0) { if (num_remaining == 0) {
break; break;
} }
in->read(buffer, min(buffer_size, num_remaining)); in->read(buffer, min((streamsize)buffer_size, num_remaining));
count = in->gcount(); count = in->gcount();
} }
@ -251,7 +252,7 @@ copy_datagram(SubfileInfo &result, const SubfileInfo &source) {
streampos start = _out->tellp(); streampos start = _out->tellp();
in.seekg(source.get_start()); in.seekg(source.get_start());
in.read(buffer, min(buffer_size, num_remaining)); in.read(buffer, min((streamsize)buffer_size, num_remaining));
streamsize count = in.gcount(); streamsize count = in.gcount();
while (count != 0) { while (count != 0) {
_out->write(buffer, count); _out->write(buffer, count);
@ -262,7 +263,7 @@ copy_datagram(SubfileInfo &result, const SubfileInfo &source) {
if (num_remaining == 0) { if (num_remaining == 0) {
break; break;
} }
in.read(buffer, min(buffer_size, num_remaining)); in.read(buffer, min((streamsize)buffer_size, num_remaining));
count = in.gcount(); count = in.gcount();
} }