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

build for gcc3.2

Browse Source
This commit is contained in:
David Rose 2003-01-17 17:43:03 +00:00
parent 19b743bef3
commit 05425ddd34
7 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandatool/src/eggbase/eggWriter.cxx
View File

@ -274,7 +274,10 @@ handle_args(ProgramBase::Args &args) {
if (!args.empty()) { if (!args.empty()) {
nout << "Unexpected arguments on command line:\n"; nout << "Unexpected arguments on command line:\n";
copy(args.begin(), args.end(), ostream_iterator<string>(nout, " ")); Args::const_iterator ai;
for (ai = args.begin(); ai != args.end(); ++ai) {
nout << (*ai) << " ";
}
nout << "\r"; nout << "\r";
return false; return false;
} }

5
pandatool/src/eggbase/somethingToEgg.cxx
View File

@ -280,7 +280,10 @@ handle_args(Args &args) {
nout << "You may only specify one " << _format_name nout << "You may only specify one " << _format_name
<< " file to read on the command line. " << " file to read on the command line. "
<< "You specified: "; << "You specified: ";
copy(args.begin(), args.end(), ostream_iterator<string>(nout, " ")); Args::const_iterator ai;
for (ai = args.begin(); ai != args.end(); ++ai) {
nout << (*ai) << " ";
}
nout << "\n"; nout << "\n";
return false; return false;
} }

5
pandatool/src/imagebase/imageWriter.cxx
View File

@ -113,7 +113,10 @@ handle_args(ProgramBase::Args &args) {
} else { } else {
if (!args.empty()) { if (!args.empty()) {
nout << "Unexpected arguments on command line:\n"; nout << "Unexpected arguments on command line:\n";
copy(args.begin(), args.end(), ostream_iterator<string>(nout, " ")); Args::const_iterator ai;
for (ai = args.begin(); ai != args.end(); ++ai) {
nout << (*ai) << " ";
}
nout << "\r"; nout << "\r";
return false; return false;
} }

4
pandatool/src/lwo/iffInputFile.cxx
View File

@ -362,7 +362,7 @@ read_byte(char &byte) {
// false otherwise. // false otherwise.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool IffInputFile:: bool IffInputFile::
read_bytes(Datagram &datagram, size_t length) { read_bytes(Datagram &datagram, int length) {
if (is_eof()) { if (is_eof()) {
return false; return false;
} }
@ -387,7 +387,7 @@ read_bytes(Datagram &datagram, size_t length) {
// Returns true if successful, false otherwise. // Returns true if successful, false otherwise.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool IffInputFile:: bool IffInputFile::
skip_bytes(size_t length) { skip_bytes(int length) {
if (is_eof()) { if (is_eof()) {
return false; return false;
} }

6
pandatool/src/lwo/iffInputFile.h
View File

@ -67,8 +67,8 @@ public:
PT(IffChunk) get_subchunk(IffChunk *context); PT(IffChunk) get_subchunk(IffChunk *context);
bool read_byte(char &byte); bool read_byte(char &byte);
bool read_bytes(Datagram &datagram, size_t length); bool read_bytes(Datagram &datagram, int length);
bool skip_bytes(size_t length); bool skip_bytes(int length);
protected: protected:
virtual IffChunk *make_new_chunk(IffId id); virtual IffChunk *make_new_chunk(IffId id);
@ -97,7 +97,7 @@ public:
private: private:
static TypeHandle _type_handle; static TypeHandle _type_handle;
friend IffChunk; friend class IffChunk;
}; };
#include "iffInputFile.I" #include "iffInputFile.I"

12
pandatool/src/lwo/lwoDiscontinuousVertexMap.cxx
View File

@ -108,11 +108,15 @@ read_iff(IffInputFile *in, size_t stop_at) {
<< " of polygon " << polygon_index << " of polygon " << polygon_index
<< " specified by discontinuous vertex map.\n" << " specified by discontinuous vertex map.\n"
<< "Original value = "; << "Original value = ";
copy(orig_value.begin(), orig_value.end(),
ostream_iterator<float>(nout, " ")); PTA_float::const_iterator vi;
for (vi = orig_value.begin(); vi != orig_value.end(); ++vi) {
nout << (*vi) << " ";
}
nout << " new value = "; nout << " new value = ";
copy(value.begin(), value.end(), for (vi = value.begin(); vi != value.end(); ++vi) {
ostream_iterator<float>(nout, " ")); nout << (*vi) << " ";
}
nout << "\n"; nout << "\n";
} }
} }

5
pandatool/src/progbase/programBase.cxx
View File

@ -407,7 +407,10 @@ bool ProgramBase::
handle_args(ProgramBase::Args &args) { handle_args(ProgramBase::Args &args) {
if (!args.empty()) { if (!args.empty()) {
nout << "Unexpected arguments on command line:\n"; nout << "Unexpected arguments on command line:\n";
copy(args.begin(), args.end(), ostream_iterator<string>(nout, " ")); Args::const_iterator ai;
for (ai = args.begin(); ai != args.end(); ++ai) {
nout << (*ai) << " ";
}
nout << "\r"; nout << "\r";
return false; return false;
} }