avoid name collisions with stlport

panda/src/express/hashVal.I

@@ -58,9 +58,9 @@ get_value(int val) const {
 //  Description: Sets the hash value at index val
 ////////////////////////////////////////////////////////////////////
 INLINE void HashVal::
-set_value(int val, uint hash) {
+set_value(int val, uint hashval) {
   nassertv(val >= 0 && val < 4);
-  hv[val] = hash;
+  hv[val] = hashval;
 }
 
 

panda/src/graph/allTransitionsWrapper.I

@@ -200,9 +200,9 @@ compare_to(const AllTransitionsWrapper &other) const {
 //  Description: Adds the transitions to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_GRAPH void AllTransitionsWrapper::
-generate_hash(GraphHashGenerator &hash) const {
+generate_hash(GraphHashGenerator &hashgen) const {
   if (_cache != (NodeTransitionCache *)NULL) {
-    _cache->generate_hash(hash);
+    _cache->generate_hash(hashgen);
   }
 }
 

panda/src/graph/allTransitionsWrapper.h

@@ -77,7 +77,7 @@ public:
 
   INLINE_GRAPH bool is_identity() const;
   INLINE_GRAPH int compare_to(const AllTransitionsWrapper &other) const;
-  INLINE_GRAPH void generate_hash(GraphHashGenerator &hash) const;
+  INLINE_GRAPH void generate_hash(GraphHashGenerator &hashgen) const;
 
   INLINE_GRAPH void make_identity();
   INLINE_GRAPH void extract_from(const NodeRelation *arc);

panda/src/graph/bitMaskTransition.T

@@ -196,9 +196,9 @@ internal_compare_to(const NodeTransition *other) const {
 ////////////////////////////////////////////////////////////////////
 template<class MaskType>
 void BitMaskTransition<MaskType>::
-internal_generate_hash(GraphHashGenerator &hash) const {
-  _and.generate_hash(hash);
-  _or.generate_hash(hash);
+internal_generate_hash(GraphHashGenerator &hashgen) const {
+  _and.generate_hash(hashgen);
+  _or.generate_hash(hashgen);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/graph/bitMaskTransition.h

@@ -56,7 +56,7 @@ public:
 
 protected:
   virtual int internal_compare_to(const NodeTransition *other) const;
-  virtual void internal_generate_hash(GraphHashGenerator &hash) const;
+  virtual void internal_generate_hash(GraphHashGenerator &hashgen) const;
 
 protected:
   virtual BitMaskTransition<MaskType> *

panda/src/graph/matrixTransition.T

@@ -182,8 +182,8 @@ internal_compare_to(const NodeTransition *other) const {
 ////////////////////////////////////////////////////////////////////
 template<class Matrix>
 void MatrixTransition<Matrix>::
-internal_generate_hash(GraphHashGenerator &hash) const {
-  _matrix.generate_hash(hash, 0.00001f);
+internal_generate_hash(GraphHashGenerator &hashgen) const {
+  _matrix.generate_hash(hashgen, 0.00001f);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/graph/matrixTransition.h

@@ -58,7 +58,7 @@ public:
 
 protected:
   virtual int internal_compare_to(const NodeTransition *other) const;
-  virtual void internal_generate_hash(GraphHashGenerator &hash) const;
+  virtual void internal_generate_hash(GraphHashGenerator &hashgen) const;
 
 protected:
   virtual MatrixTransition<Matrix> *

panda/src/graph/nodeTransition.I

@@ -117,9 +117,9 @@ operator >= (const NodeTransition &other) const {
 //  Description: Adds the transition to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_GRAPH void NodeTransition::
-generate_hash(GraphHashGenerator &hash) const {
-  hash.add_int(get_handle().get_index());
-  internal_generate_hash(hash);
+generate_hash(GraphHashGenerator &hashgen) const {
+  hashgen.add_int(get_handle().get_index());
+  internal_generate_hash(hashgen);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/graph/nodeTransition.h

@@ -75,7 +75,7 @@ public:
 
   int compare_to(const NodeTransition &other) const;
   int compare_to_ignore_priority(const NodeTransition &other) const;
-  INLINE_GRAPH void generate_hash(GraphHashGenerator &hash) const;
+  INLINE_GRAPH void generate_hash(GraphHashGenerator &hashgen) const;
 
 PUBLISHED:
   INLINE_GRAPH void set_priority(int priority);
@@ -105,7 +105,7 @@ public:
 
 protected:
   virtual int internal_compare_to(const NodeTransition *other) const=0;
-  virtual void internal_generate_hash(GraphHashGenerator &hash) const;
+  virtual void internal_generate_hash(GraphHashGenerator &hashgen) const;
 
   // And this is the internal function we'll call whenever our value
   // changes.

panda/src/graph/nodeTransitionCache.cxx

@@ -127,10 +127,10 @@ compare_to(const NodeTransitionCache &other) const {
 //  Description: Adds the transitions to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 void NodeTransitionCache::
-generate_hash(GraphHashGenerator &hash) const {
+generate_hash(GraphHashGenerator &hashgen) const {
   Cache::const_iterator ci;
   for (ci = _cache.begin(); ci != _cache.end(); ++ci) {
-    (*ci).second.generate_hash(hash);
+    (*ci).second.generate_hash(hashgen);
   }
 }
 

panda/src/graph/nodeTransitionCache.h

@@ -47,7 +47,7 @@ public:
 
   bool is_identity() const;
   int compare_to(const NodeTransitionCache &other) const;
-  void generate_hash(GraphHashGenerator &hash) const;
+  void generate_hash(GraphHashGenerator &hashgen) const;
 
   bool is_empty() const;
   PT(NodeTransition) set_transition(TypeHandle handle, NodeTransition *trans);

panda/src/graph/nodeTransitionCacheEntry.I

@@ -95,9 +95,9 @@ compare_to(const NodeTransitionCacheEntry &other) const {
 //  Description: Adds the transition to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_GRAPH void NodeTransitionCacheEntry::
-generate_hash(GraphHashGenerator &hash) const {
+generate_hash(GraphHashGenerator &hashgen) const {
   if (_trans != (NodeTransition *)NULL) {
-    _trans->generate_hash(hash);
+    _trans->generate_hash(hashgen);
   }
 }
 

panda/src/graph/nodeTransitionCacheEntry.h

@@ -44,7 +44,7 @@ public:
 
   INLINE_GRAPH bool is_identity() const;
   INLINE_GRAPH int compare_to(const NodeTransitionCacheEntry &other) const;
-  INLINE_GRAPH void generate_hash(GraphHashGenerator &hash) const;
+  INLINE_GRAPH void generate_hash(GraphHashGenerator &hashgen) const;
 
   INLINE_GRAPH void clear();
 

panda/src/linmath/lmatrix3_src.I

@@ -1116,8 +1116,8 @@ almost_equal(const FLOATNAME(LMatrix3) &other) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LMatrix3)::
-generate_hash(ChecksumHashGenerator &hash) const {
-  generate_hash(hash, NEARLY_ZERO(FLOATTYPE));
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  generate_hash(hashgen, NEARLY_ZERO(FLOATTYPE));
 }
 
 

panda/src/linmath/lmatrix3_src.cxx

@@ -128,10 +128,10 @@ write(ostream &out, int indent_level) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 void FLOATNAME(LMatrix3)::
-generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const {
+generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const {
   for(int i = 0; i < 3; i++) {
     for(int j = 0; j < 3; j++) {
-      hash.add_fp(get_cell(i,j), threshold);
+      hashgen.add_fp(get_cell(i,j), threshold);
     }
   }
 }

panda/src/linmath/lmatrix3_src.h

@@ -170,8 +170,8 @@ PUBLISHED:
   void write(ostream &out, int indent_level = 0) const;
 
 public:
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash) const;
-  void generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const;
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen) const;
+  void generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const;
 
 public:
   union {

panda/src/linmath/lmatrix4_src.I

@@ -1397,8 +1397,8 @@ almost_equal(const FLOATNAME(LMatrix4) &other) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LMatrix4)::
-generate_hash(ChecksumHashGenerator &hash) const {
-  generate_hash(hash, NEARLY_ZERO(FLOATTYPE));
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  generate_hash(hashgen, NEARLY_ZERO(FLOATTYPE));
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/linmath/lmatrix4_src.cxx

@@ -216,10 +216,10 @@ write(ostream &out, int indent_level) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 void FLOATNAME(LMatrix4)::
-generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const {
+generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const {
   for(int i = 0; i < 4; i++) {
     for(int j = 0; j < 4; j++) {
-      hash.add_fp(get_cell(i,j), threshold);
+      hashgen.add_fp(get_cell(i,j), threshold);
     }
   }
 }

panda/src/linmath/lmatrix4_src.h

@@ -166,8 +166,8 @@ PUBLISHED:
   void write(ostream &out, int indent_level = 0) const;
 
 public:
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash) const;
-  void generate_hash(ChecksumHashGenerator &hash, FLOATTYPE scale) const;
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen) const;
+  void generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE scale) const;
 
 public:
   union {

panda/src/linmath/lvecBase2_src.I

@@ -524,8 +524,8 @@ output(ostream &out) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase2)::
-generate_hash(ChecksumHashGenerator &hash) const {
-  generate_hash(hash, NEARLY_ZERO(FLOATTYPE));
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  generate_hash(hashgen, NEARLY_ZERO(FLOATTYPE));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -534,9 +534,9 @@ generate_hash(ChecksumHashGenerator &hash) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase2)::
-generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const {
-  hash.add_fp(_v.v._0, threshold);
-  hash.add_fp(_v.v._1, threshold);
+generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const {
+  hashgen.add_fp(_v.v._0, threshold);
+  hashgen.add_fp(_v.v._1, threshold);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/linmath/lvecBase2_src.h

@@ -102,8 +102,8 @@ PUBLISHED:
   INLINE_LINMATH void output(ostream &out) const;
 
 public:
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash) const;
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash,
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen) const;
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen,
                                     FLOATTYPE threshold) const;
 
 public:

panda/src/linmath/lvecBase3_src.I

@@ -595,8 +595,8 @@ output(ostream &out) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase3)::
-generate_hash(ChecksumHashGenerator &hash) const {
-  generate_hash(hash, NEARLY_ZERO(FLOATTYPE));
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  generate_hash(hashgen, NEARLY_ZERO(FLOATTYPE));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -605,10 +605,10 @@ generate_hash(ChecksumHashGenerator &hash) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase3)::
-generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const {
-  hash.add_fp(_v.v._0, threshold);
-  hash.add_fp(_v.v._1, threshold);
-  hash.add_fp(_v.v._2, threshold);
+generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const {
+  hashgen.add_fp(_v.v._0, threshold);
+  hashgen.add_fp(_v.v._1, threshold);
+  hashgen.add_fp(_v.v._2, threshold);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/linmath/lvecBase3_src.h

@@ -104,8 +104,8 @@ PUBLISHED:
   INLINE_LINMATH void output(ostream &out) const;
 
 public:
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash) const;
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash,
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen) const;
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen,
                                     FLOATTYPE threshold) const;
 
 public:

panda/src/linmath/lvecBase4_src.I

@@ -624,8 +624,8 @@ output(ostream &out) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase4)::
-generate_hash(ChecksumHashGenerator &hash) const {
-  generate_hash(hash, NEARLY_ZERO(FLOATTYPE));
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  generate_hash(hashgen, NEARLY_ZERO(FLOATTYPE));
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -634,11 +634,11 @@ generate_hash(ChecksumHashGenerator &hash) const {
 //  Description: Adds the vector to the indicated hash generator.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH void FLOATNAME(LVecBase4)::
-generate_hash(ChecksumHashGenerator &hash, FLOATTYPE threshold) const {
-  hash.add_fp(_v.v._0, threshold);
-  hash.add_fp(_v.v._1, threshold);
-  hash.add_fp(_v.v._2, threshold);
-  hash.add_fp(_v.v._3, threshold);
+generate_hash(ChecksumHashGenerator &hashgen, FLOATTYPE threshold) const {
+  hashgen.add_fp(_v.v._0, threshold);
+  hashgen.add_fp(_v.v._1, threshold);
+  hashgen.add_fp(_v.v._2, threshold);
+  hashgen.add_fp(_v.v._3, threshold);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/linmath/lvecBase4_src.h

@@ -104,8 +104,8 @@ PUBLISHED:
   INLINE_LINMATH void output(ostream &out) const;
 
 public:
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash) const;
-  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hash,
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen) const;
+  INLINE_LINMATH void generate_hash(ChecksumHashGenerator &hashgen,
                                     FLOATTYPE threshold) const;
 
 public:

panda/src/putil/bitMask.I

@@ -543,8 +543,8 @@ operator >>= (int shift) {
 ////////////////////////////////////////////////////////////////////
 template<class WordType, int num_bits>
 INLINE void BitMask<WordType, num_bits>::
-generate_hash(ChecksumHashGenerator &hash) const {
-  hash.add_int(_word);
+generate_hash(ChecksumHashGenerator &hashgen) const {
+  hashgen.add_int(_word);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/putil/bitMask.h

@@ -98,7 +98,7 @@ PUBLISHED:
   INLINE void operator >>= (int shift);
 
 public:
-  INLINE void generate_hash(ChecksumHashGenerator &hash) const;
+  INLINE void generate_hash(ChecksumHashGenerator &hashgen) const;
 
 private:
   WordType _word;