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

fix stlport name conflict

Browse Source
This commit is contained in:
cxgeorge 2001-12-10 04:49:20 +00:00
parent 9d1ac63f50
commit ee3eb1072f
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/dcparser/dcAtomicField.cxx
View File

@ -632,15 +632,15 @@ write(ostream &out, int indent_level) const {
// hash. // hash.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DCAtomicField:: void DCAtomicField::
generate_hash(HashGenerator &hash) const { generate_hash(HashGenerator &hashgen) const {
DCField::generate_hash(hash); DCField::generate_hash(hashgen);
hash.add_int(_elements.size()); hashgen.add_int(_elements.size());
Elements::const_iterator ei; Elements::const_iterator ei;
for (ei = _elements.begin(); ei != _elements.end(); ++ei) { for (ei = _elements.begin(); ei != _elements.end(); ++ei) {
const ElementType &element = (*ei); const ElementType &element = (*ei);
hash.add_int(element._type); hashgen.add_int(element._type);
hash.add_int(element._divisor); hashgen.add_int(element._divisor);
} }
hash.add_int(_flags); hashgen.add_int(_flags);
} }

12
direct/src/dcparser/dcClass.cxx
View File

@ -219,19 +219,19 @@ write(ostream &out, int indent_level) const {
// hash. // hash.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DCClass:: void DCClass::
generate_hash(HashGenerator &hash) const { generate_hash(HashGenerator &hashgen) const {
hash.add_string(_name); hashgen.add_string(_name);
hash.add_int(_parents.size()); hashgen.add_int(_parents.size());
Parents::const_iterator pi; Parents::const_iterator pi;
for (pi = _parents.begin(); pi != _parents.end(); ++pi) { for (pi = _parents.begin(); pi != _parents.end(); ++pi) {
hash.add_int((*pi)->get_number()); hashgen.add_int((*pi)->get_number());
} }
hash.add_int(_fields.size()); hashgen.add_int(_fields.size());
Fields::const_iterator fi; Fields::const_iterator fi;
for (fi = _fields.begin(); fi != _fields.end(); ++fi) { for (fi = _fields.begin(); fi != _fields.end(); ++fi) {
(*fi)->generate_hash(hash); (*fi)->generate_hash(hashgen);
} }
} }

4
direct/src/dcparser/dcField.cxx
View File

@ -81,10 +81,10 @@ DCField::
// hash. // hash.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DCField:: void DCField::
generate_hash(HashGenerator &hash) const { generate_hash(HashGenerator &hashgen) const {
// It shouldn't be necessary to explicitly add _number to the // It shouldn't be necessary to explicitly add _number to the
// hash--this is computed based on the relative position of this // hash--this is computed based on the relative position of this
// field with the other fields, so adding it explicitly will be // field with the other fields, so adding it explicitly will be
// redundant. However, the field name is significant. // redundant. However, the field name is significant.
hash.add_string(_name); hashgen.add_string(_name);
} }

12
direct/src/dcparser/dcFile.cxx
View File

@ -209,9 +209,9 @@ get_class_by_name(const string &name) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
unsigned long DCFile:: unsigned long DCFile::
get_hash() const { get_hash() const {
HashGenerator hash; HashGenerator hashgen;
generate_hash(hash); generate_hash(hashgen);
return hash.get_hash(); return hashgen.get_hash();
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -221,11 +221,11 @@ get_hash() const {
// hash. // hash.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DCFile:: void DCFile::
generate_hash(HashGenerator &hash) const { generate_hash(HashGenerator &hashgen) const {
hash.add_int(_classes.size()); hashgen.add_int(_classes.size());
Classes::const_iterator ci; Classes::const_iterator ci;
for (ci = _classes.begin(); ci != _classes.end(); ++ci) { for (ci = _classes.begin(); ci != _classes.end(); ++ci) {
(*ci)->generate_hash(hash); (*ci)->generate_hash(hashgen);
} }
} }

8
direct/src/dcparser/dcMolecularField.cxx
View File

@ -101,12 +101,12 @@ write(ostream &out, int indent_level) const {
// hash. // hash.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DCMolecularField:: void DCMolecularField::
generate_hash(HashGenerator &hash) const { generate_hash(HashGenerator &hashgen) const {
DCField::generate_hash(hash); DCField::generate_hash(hashgen);
hash.add_int(_fields.size()); hashgen.add_int(_fields.size());
Fields::const_iterator fi; Fields::const_iterator fi;
for (fi = _fields.begin(); fi != _fields.end(); ++fi) { for (fi = _fields.begin(); fi != _fields.end(); ++fi) {
(*fi)->generate_hash(hash); (*fi)->generate_hash(hashgen);
} }
} }