*** empty log message ***

This commit is contained in:
David Rose 2001-03-24 01:45:24 +00:00
parent f20914c08e
commit 2eb381b73a
6 changed files with 8 additions and 6 deletions

View File

@ -194,7 +194,7 @@ get_class_by_name(const string &name) {
// very likely to be different if the contents of the // very likely to be different if the contents of the
// file do change. // file do change.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
long DCFile:: unsigned long DCFile::
get_hash() const { get_hash() const {
HashGenerator hash; HashGenerator hash;
generate_hash(hash); generate_hash(hash);

View File

@ -35,7 +35,7 @@ PUBLISHED:
DCClass *get_class_by_name(const string &name); DCClass *get_class_by_name(const string &name);
long get_hash() const; unsigned long get_hash() const;
public: public:
void generate_hash(HashGenerator &hash) const; void generate_hash(HashGenerator &hash) const;

View File

@ -34,9 +34,11 @@
#if defined(WIN32) #if defined(WIN32)
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <iomanip>
#else #else
#include <iostream.h> #include <iostream.h>
#include <fstream.h> #include <fstream.h>
#include <iomanip.h>
#endif #endif
#include <string> #include <string>

View File

@ -60,7 +60,7 @@ add_string(const string &str) {
// Access: Public // Access: Public
// Description: Returns the hash number generated. // Description: Returns the hash number generated.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
long HashGenerator:: unsigned long HashGenerator::
get_hash() const { get_hash() const {
return _hash & 0xffffffff; return (unsigned long)(_hash & 0xffffffff);
} }

View File

@ -21,7 +21,7 @@ public:
void add_int(int num); void add_int(int num);
void add_string(const string &str); void add_string(const string &str);
long get_hash() const; unsigned long get_hash() const;
private: private:
long _hash; long _hash;

View File

@ -42,7 +42,7 @@ operator [] (int n) {
maybe_prime = false; maybe_prime = false;
} }
j++; j++;
nassertr(j < (int)_primes.size(), 0) nassertr(j < (int)_primes.size(), 0);
} }
if (maybe_prime) { if (maybe_prime) {
// Hey, we found a prime! // Hey, we found a prime!