Browse Source

make primes use vector_int class from dtool to avoid multiply defined vector<int> classes

cxgeorge 24 years ago
parent
commit
e41293cb0d

+ 2 - 0
direct/src/dcparser/dcparser_composite1.cxx

@@ -1,4 +1,6 @@
 
+#include "primeNumberGenerator.cxx"
+#include "hashGenerator.cxx"
 #include "dcAtomicField.cxx"
 #include "dcClass.cxx"
 

+ 0 - 2
direct/src/dcparser/dcparser_composite2.cxx

@@ -4,5 +4,3 @@
 #include "dcMolecularField.cxx"
 #include "dcSubatomicType.cxx"
 #include "dcindent.cxx"
-#include "hashGenerator.cxx"
-#include "primeNumberGenerator.cxx"

+ 2 - 1
direct/src/dcparser/primeNumberGenerator.h

@@ -20,6 +20,7 @@
 #define PRIMENUMBERGENERATOR_H
 
 #include "dcbase.h"
+#include "vector_int.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : PrimeNumberGenerator
@@ -36,7 +37,7 @@ public:
   int operator [] (int n);
 
 private:
-  typedef pvector<int> Primes;
+  typedef vector_int Primes;
   Primes _primes;
 };