From da9b31509989854c0e99fa0c23ea1ad09ab2b46b Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Mon, 10 Dec 2001 02:52:47 +0000 Subject: [PATCH] avoid name collisions with stlport --- panda/src/express/hashVal.I | 4 ++-- panda/src/graph/allTransitionsWrapper.I | 4 ++-- panda/src/graph/allTransitionsWrapper.h | 2 +- panda/src/graph/bitMaskTransition.T | 6 +++--- panda/src/graph/bitMaskTransition.h | 2 +- panda/src/graph/matrixTransition.T | 4 ++-- panda/src/graph/matrixTransition.h | 2 +- panda/src/graph/nodeTransition.I | 6 +++--- panda/src/graph/nodeTransition.h | 4 ++-- panda/src/graph/nodeTransitionCache.cxx | 4 ++-- panda/src/graph/nodeTransitionCache.h | 2 +- panda/src/graph/nodeTransitionCacheEntry.I | 4 ++-- panda/src/graph/nodeTransitionCacheEntry.h | 2 +- panda/src/linmath/lmatrix3_src.I | 4 ++-- panda/src/linmath/lmatrix3_src.cxx | 4 ++-- panda/src/linmath/lmatrix3_src.h | 4 ++-- panda/src/linmath/lmatrix4_src.I | 4 ++-- panda/src/linmath/lmatrix4_src.cxx | 4 ++-- panda/src/linmath/lmatrix4_src.h | 4 ++-- panda/src/linmath/lvecBase2_src.I | 10 +++++----- panda/src/linmath/lvecBase2_src.h | 4 ++-- panda/src/linmath/lvecBase3_src.I | 12 ++++++------ panda/src/linmath/lvecBase3_src.h | 4 ++-- panda/src/linmath/lvecBase4_src.I | 14 +++++++------- panda/src/linmath/lvecBase4_src.h | 4 ++-- panda/src/putil/bitMask.I | 4 ++-- panda/src/putil/bitMask.h | 2 +- 27 files changed, 62 insertions(+), 62 deletions(-) diff --git a/panda/src/express/hashVal.I b/panda/src/express/hashVal.I index 85d0ba27a8..394a334b27 100644 --- a/panda/src/express/hashVal.I +++ b/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; } diff --git a/panda/src/graph/allTransitionsWrapper.I b/panda/src/graph/allTransitionsWrapper.I index 5dcbbee4ae..b5244b9806 100644 --- a/panda/src/graph/allTransitionsWrapper.I +++ b/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); } } diff --git a/panda/src/graph/allTransitionsWrapper.h b/panda/src/graph/allTransitionsWrapper.h index 63fc3929e8..69c5251c9e 100644 --- a/panda/src/graph/allTransitionsWrapper.h +++ b/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); diff --git a/panda/src/graph/bitMaskTransition.T b/panda/src/graph/bitMaskTransition.T index 9ea185b25d..6e8163a4d5 100644 --- a/panda/src/graph/bitMaskTransition.T +++ b/panda/src/graph/bitMaskTransition.T @@ -196,9 +196,9 @@ internal_compare_to(const NodeTransition *other) const { //////////////////////////////////////////////////////////////////// template void BitMaskTransition:: -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); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/graph/bitMaskTransition.h b/panda/src/graph/bitMaskTransition.h index 6e18972ee2..2c9ddab25b 100644 --- a/panda/src/graph/bitMaskTransition.h +++ b/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 * diff --git a/panda/src/graph/matrixTransition.T b/panda/src/graph/matrixTransition.T index db25f3d5e7..e4afa49141 100644 --- a/panda/src/graph/matrixTransition.T +++ b/panda/src/graph/matrixTransition.T @@ -182,8 +182,8 @@ internal_compare_to(const NodeTransition *other) const { //////////////////////////////////////////////////////////////////// template void MatrixTransition:: -internal_generate_hash(GraphHashGenerator &hash) const { - _matrix.generate_hash(hash, 0.00001f); +internal_generate_hash(GraphHashGenerator &hashgen) const { + _matrix.generate_hash(hashgen, 0.00001f); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/graph/matrixTransition.h b/panda/src/graph/matrixTransition.h index ea42a281d3..7cd7e0e16f 100644 --- a/panda/src/graph/matrixTransition.h +++ b/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 * diff --git a/panda/src/graph/nodeTransition.I b/panda/src/graph/nodeTransition.I index a561d2a38d..6e46bf7feb 100644 --- a/panda/src/graph/nodeTransition.I +++ b/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); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/graph/nodeTransition.h b/panda/src/graph/nodeTransition.h index ab2f3b0758..b36cc74f62 100644 --- a/panda/src/graph/nodeTransition.h +++ b/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. diff --git a/panda/src/graph/nodeTransitionCache.cxx b/panda/src/graph/nodeTransitionCache.cxx index f79542b830..0b95ea8f99 100644 --- a/panda/src/graph/nodeTransitionCache.cxx +++ b/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); } } diff --git a/panda/src/graph/nodeTransitionCache.h b/panda/src/graph/nodeTransitionCache.h index 7a7b30466e..54e914857f 100644 --- a/panda/src/graph/nodeTransitionCache.h +++ b/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); diff --git a/panda/src/graph/nodeTransitionCacheEntry.I b/panda/src/graph/nodeTransitionCacheEntry.I index b42a9aabb4..cb76d0460c 100644 --- a/panda/src/graph/nodeTransitionCacheEntry.I +++ b/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); } } diff --git a/panda/src/graph/nodeTransitionCacheEntry.h b/panda/src/graph/nodeTransitionCacheEntry.h index c12e63d8d8..5133be7060 100644 --- a/panda/src/graph/nodeTransitionCacheEntry.h +++ b/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(); diff --git a/panda/src/linmath/lmatrix3_src.I b/panda/src/linmath/lmatrix3_src.I index 224132ebd7..1c3907cac1 100644 --- a/panda/src/linmath/lmatrix3_src.I +++ b/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)); } diff --git a/panda/src/linmath/lmatrix3_src.cxx b/panda/src/linmath/lmatrix3_src.cxx index f06c766567..80da4207ee 100644 --- a/panda/src/linmath/lmatrix3_src.cxx +++ b/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); } } } diff --git a/panda/src/linmath/lmatrix3_src.h b/panda/src/linmath/lmatrix3_src.h index 45562cbb1d..6181d01f8f 100644 --- a/panda/src/linmath/lmatrix3_src.h +++ b/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 { diff --git a/panda/src/linmath/lmatrix4_src.I b/panda/src/linmath/lmatrix4_src.I index 3f76fd2cf7..e1afec4776 100644 --- a/panda/src/linmath/lmatrix4_src.I +++ b/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)); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/linmath/lmatrix4_src.cxx b/panda/src/linmath/lmatrix4_src.cxx index 076997190f..290c007f0a 100644 --- a/panda/src/linmath/lmatrix4_src.cxx +++ b/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); } } } diff --git a/panda/src/linmath/lmatrix4_src.h b/panda/src/linmath/lmatrix4_src.h index 2af113156b..ad00cb0e02 100644 --- a/panda/src/linmath/lmatrix4_src.h +++ b/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 { diff --git a/panda/src/linmath/lvecBase2_src.I b/panda/src/linmath/lvecBase2_src.I index 179d570848..11888aea7b 100644 --- a/panda/src/linmath/lvecBase2_src.I +++ b/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); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/linmath/lvecBase2_src.h b/panda/src/linmath/lvecBase2_src.h index 7433d6acd4..7946a80b56 100644 --- a/panda/src/linmath/lvecBase2_src.h +++ b/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: diff --git a/panda/src/linmath/lvecBase3_src.I b/panda/src/linmath/lvecBase3_src.I index 4e876d20a5..bd2ab62ce1 100644 --- a/panda/src/linmath/lvecBase3_src.I +++ b/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); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/linmath/lvecBase3_src.h b/panda/src/linmath/lvecBase3_src.h index 1728c7a14b..c73c297ad1 100644 --- a/panda/src/linmath/lvecBase3_src.h +++ b/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: diff --git a/panda/src/linmath/lvecBase4_src.I b/panda/src/linmath/lvecBase4_src.I index 79b2e2e5a4..72d4d3e5cf 100644 --- a/panda/src/linmath/lvecBase4_src.I +++ b/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); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/linmath/lvecBase4_src.h b/panda/src/linmath/lvecBase4_src.h index 8d16eca8f3..be20a03d42 100644 --- a/panda/src/linmath/lvecBase4_src.h +++ b/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: diff --git a/panda/src/putil/bitMask.I b/panda/src/putil/bitMask.I index 9af2dbe96e..a8038c7b6b 100644 --- a/panda/src/putil/bitMask.I +++ b/panda/src/putil/bitMask.I @@ -543,8 +543,8 @@ operator >>= (int shift) { //////////////////////////////////////////////////////////////////// template INLINE void BitMask:: -generate_hash(ChecksumHashGenerator &hash) const { - hash.add_int(_word); +generate_hash(ChecksumHashGenerator &hashgen) const { + hashgen.add_int(_word); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h index dc50c3aa60..a7ab694c9b 100644 --- a/panda/src/putil/bitMask.h +++ b/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;