mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 09:23:03 -04:00
build for gcc3.2
This commit is contained in:
parent
19b743bef3
commit
05425ddd34
@ -274,7 +274,10 @@ handle_args(ProgramBase::Args &args) {
|
||||
|
||||
if (!args.empty()) {
|
||||
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";
|
||||
return false;
|
||||
}
|
||||
|
@ -280,7 +280,10 @@ handle_args(Args &args) {
|
||||
nout << "You may only specify one " << _format_name
|
||||
<< " file to read on the command line. "
|
||||
<< "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";
|
||||
return false;
|
||||
}
|
||||
|
@ -113,7 +113,10 @@ handle_args(ProgramBase::Args &args) {
|
||||
} else {
|
||||
if (!args.empty()) {
|
||||
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";
|
||||
return false;
|
||||
}
|
||||
|
@ -362,7 +362,7 @@ read_byte(char &byte) {
|
||||
// false otherwise.
|
||||
////////////////////////////////////////////////////////////////////
|
||||
bool IffInputFile::
|
||||
read_bytes(Datagram &datagram, size_t length) {
|
||||
read_bytes(Datagram &datagram, int length) {
|
||||
if (is_eof()) {
|
||||
return false;
|
||||
}
|
||||
@ -387,7 +387,7 @@ read_bytes(Datagram &datagram, size_t length) {
|
||||
// Returns true if successful, false otherwise.
|
||||
////////////////////////////////////////////////////////////////////
|
||||
bool IffInputFile::
|
||||
skip_bytes(size_t length) {
|
||||
skip_bytes(int length) {
|
||||
if (is_eof()) {
|
||||
return false;
|
||||
}
|
||||
|
@ -67,8 +67,8 @@ public:
|
||||
PT(IffChunk) get_subchunk(IffChunk *context);
|
||||
|
||||
bool read_byte(char &byte);
|
||||
bool read_bytes(Datagram &datagram, size_t length);
|
||||
bool skip_bytes(size_t length);
|
||||
bool read_bytes(Datagram &datagram, int length);
|
||||
bool skip_bytes(int length);
|
||||
|
||||
protected:
|
||||
virtual IffChunk *make_new_chunk(IffId id);
|
||||
@ -97,7 +97,7 @@ public:
|
||||
private:
|
||||
static TypeHandle _type_handle;
|
||||
|
||||
friend IffChunk;
|
||||
friend class IffChunk;
|
||||
};
|
||||
|
||||
#include "iffInputFile.I"
|
||||
|
@ -108,11 +108,15 @@ read_iff(IffInputFile *in, size_t stop_at) {
|
||||
<< " of polygon " << polygon_index
|
||||
<< " specified by discontinuous vertex map.\n"
|
||||
<< "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 = ";
|
||||
copy(value.begin(), value.end(),
|
||||
ostream_iterator<float>(nout, " "));
|
||||
for (vi = value.begin(); vi != value.end(); ++vi) {
|
||||
nout << (*vi) << " ";
|
||||
}
|
||||
nout << "\n";
|
||||
}
|
||||
}
|
||||
|
@ -407,7 +407,10 @@ bool ProgramBase::
|
||||
handle_args(ProgramBase::Args &args) {
|
||||
if (!args.empty()) {
|
||||
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";
|
||||
return false;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user