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

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

Browse Source
This commit is contained in:
cxgeorge 2001-11-09 02:09:43 +00:00
parent 5879732769
commit e41293cb0d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/dcparser/dcparser_composite1.cxx
View File

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

2
direct/src/dcparser/dcparser_composite2.cxx
View File

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

3
direct/src/dcparser/primeNumberGenerator.h
View File

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