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

avoid name collisions with stlport

Browse Source
This commit is contained in:
cxgeorge 2001-12-10 02:52:47 +00:00
parent b7ea87d1b5
commit da9b315099
27 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/express/hashVal.I
View File

@ -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;
}

4
panda/src/graph/allTransitionsWrapper.I
View File

@ -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);
}
}

2
panda/src/graph/allTransitionsWrapper.h
View File

@ -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);

6
panda/src/graph/bitMaskTransition.T
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

2
panda/src/graph/bitMaskTransition.h
View File

@ -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> *

4
panda/src/graph/matrixTransition.T
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

2
panda/src/graph/matrixTransition.h
View File

@ -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> *

6
panda/src/graph/nodeTransition.I
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

4
panda/src/graph/nodeTransition.h
View File

@ -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.

4
panda/src/graph/nodeTransitionCache.cxx
View File

@ -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);
}
}

2
panda/src/graph/nodeTransitionCache.h
View File

@ -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);

4
panda/src/graph/nodeTransitionCacheEntry.I
View File

@ -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);
}
}

2
panda/src/graph/nodeTransitionCacheEntry.h
View File

@ -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();

4
panda/src/linmath/lmatrix3_src.I
View File

@ -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));
}

4
panda/src/linmath/lmatrix3_src.cxx
View File

@ -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);
}
}
}

4
panda/src/linmath/lmatrix3_src.h
View File

@ -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 {

4
panda/src/linmath/lmatrix4_src.I
View File

@ -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));
}
////////////////////////////////////////////////////////////////////

4
panda/src/linmath/lmatrix4_src.cxx
View File

@ -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);
}
}
}

4
panda/src/linmath/lmatrix4_src.h
View File

@ -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 {

10
panda/src/linmath/lvecBase2_src.I
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

4
panda/src/linmath/lvecBase2_src.h
View File

@ -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:

12
panda/src/linmath/lvecBase3_src.I
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

4
panda/src/linmath/lvecBase3_src.h
View File

@ -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:

14
panda/src/linmath/lvecBase4_src.I
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

4
panda/src/linmath/lvecBase4_src.h
View File

@ -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:

4
panda/src/putil/bitMask.I
View File

@ -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);
}
////////////////////////////////////////////////////////////////////

2
panda/src/putil/bitMask.h
View File

@ -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;