From ee3eb1072f65849da1c8dde2c5b12ceab987f395 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Mon, 10 Dec 2001 04:49:20 +0000
Subject: [PATCH] fix stlport name conflict

---
 direct/src/dcparser/dcAtomicField.cxx    | 12 ++++++------
 direct/src/dcparser/dcClass.cxx          | 12 ++++++------
 direct/src/dcparser/dcField.cxx          |  4 ++--
 direct/src/dcparser/dcFile.cxx           | 12 ++++++------
 direct/src/dcparser/dcMolecularField.cxx |  8 ++++----
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/direct/src/dcparser/dcAtomicField.cxx b/direct/src/dcparser/dcAtomicField.cxx
index b776c384b6..02392ab41e 100644
--- a/direct/src/dcparser/dcAtomicField.cxx
+++ b/direct/src/dcparser/dcAtomicField.cxx
@@ -632,15 +632,15 @@ write(ostream &out, int indent_level) const {
 //               hash.
 ////////////////////////////////////////////////////////////////////
 void DCAtomicField::
-generate_hash(HashGenerator &hash) const {
-  DCField::generate_hash(hash);
+generate_hash(HashGenerator &hashgen) const {
+  DCField::generate_hash(hashgen);
 
-  hash.add_int(_elements.size());
+  hashgen.add_int(_elements.size());
   Elements::const_iterator ei;
   for (ei = _elements.begin(); ei != _elements.end(); ++ei) {
     const ElementType &element = (*ei);
-    hash.add_int(element._type);
-    hash.add_int(element._divisor);
+    hashgen.add_int(element._type);
+    hashgen.add_int(element._divisor);
   }
-  hash.add_int(_flags);
+  hashgen.add_int(_flags);
 }
diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx
index 6d78879810..ca1816e1ac 100644
--- a/direct/src/dcparser/dcClass.cxx
+++ b/direct/src/dcparser/dcClass.cxx
@@ -219,19 +219,19 @@ write(ostream &out, int indent_level) const {
 //               hash.
 ////////////////////////////////////////////////////////////////////
 void DCClass::
-generate_hash(HashGenerator &hash) const {
-  hash.add_string(_name);
+generate_hash(HashGenerator &hashgen) const {
+  hashgen.add_string(_name);
 
-  hash.add_int(_parents.size());
+  hashgen.add_int(_parents.size());
   Parents::const_iterator 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;
   for (fi = _fields.begin(); fi != _fields.end(); ++fi) {
-    (*fi)->generate_hash(hash);
+    (*fi)->generate_hash(hashgen);
   }
 }
 
diff --git a/direct/src/dcparser/dcField.cxx b/direct/src/dcparser/dcField.cxx
index 0dfe6af3e2..783644e5db 100644
--- a/direct/src/dcparser/dcField.cxx
+++ b/direct/src/dcparser/dcField.cxx
@@ -81,10 +81,10 @@ DCField::
 //               hash.
 ////////////////////////////////////////////////////////////////////
 void DCField::
-generate_hash(HashGenerator &hash) const {
+generate_hash(HashGenerator &hashgen) const {
   // It shouldn't be necessary to explicitly add _number to the
   // hash--this is computed based on the relative position of this
   // field with the other fields, so adding it explicitly will be
   // redundant.  However, the field name is significant.
-  hash.add_string(_name);
+  hashgen.add_string(_name);
 }
diff --git a/direct/src/dcparser/dcFile.cxx b/direct/src/dcparser/dcFile.cxx
index 29136b4cde..93f836337e 100644
--- a/direct/src/dcparser/dcFile.cxx
+++ b/direct/src/dcparser/dcFile.cxx
@@ -209,9 +209,9 @@ get_class_by_name(const string &name) {
 ////////////////////////////////////////////////////////////////////
 unsigned long DCFile::
 get_hash() const {
-  HashGenerator hash;
-  generate_hash(hash);
-  return hash.get_hash();
+  HashGenerator hashgen;
+  generate_hash(hashgen);
+  return hashgen.get_hash();
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -221,11 +221,11 @@ get_hash() const {
 //               hash.
 ////////////////////////////////////////////////////////////////////
 void DCFile::
-generate_hash(HashGenerator &hash) const {
-  hash.add_int(_classes.size());
+generate_hash(HashGenerator &hashgen) const {
+  hashgen.add_int(_classes.size());
   Classes::const_iterator ci;
   for (ci = _classes.begin(); ci != _classes.end(); ++ci) {
-    (*ci)->generate_hash(hash);
+    (*ci)->generate_hash(hashgen);
   }
 }
 
diff --git a/direct/src/dcparser/dcMolecularField.cxx b/direct/src/dcparser/dcMolecularField.cxx
index 492ae5f31c..da27cfaf78 100644
--- a/direct/src/dcparser/dcMolecularField.cxx
+++ b/direct/src/dcparser/dcMolecularField.cxx
@@ -101,12 +101,12 @@ write(ostream &out, int indent_level) const {
 //               hash.
 ////////////////////////////////////////////////////////////////////
 void DCMolecularField::
-generate_hash(HashGenerator &hash) const {
-  DCField::generate_hash(hash);
+generate_hash(HashGenerator &hashgen) const {
+  DCField::generate_hash(hashgen);
 
-  hash.add_int(_fields.size());
+  hashgen.add_int(_fields.size());
   Fields::const_iterator fi;
   for (fi = _fields.begin(); fi != _fields.end(); ++fi) {
-    (*fi)->generate_hash(hash);
+    (*fi)->generate_hash(hashgen);
   }
 }