Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
2eb381b73a

+ 1 - 1
direct/src/dcparser/dcFile.cxx

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

+ 1 - 1
direct/src/dcparser/dcFile.h

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

+ 2 - 0
direct/src/dcparser/dcbase.h

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

+ 2 - 2
direct/src/dcparser/hashGenerator.cxx

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

+ 1 - 1
direct/src/dcparser/hashGenerator.h

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

+ 1 - 1
direct/src/dcparser/primeNumberGenerator.cxx

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