express: Move all vector_* types to dtoolutil

dtool/src/dtoolutil/p3dtoolutil_composite2.cxx

@@ -8,6 +8,9 @@
 #include "stringDecoder.cxx"
 #include "textEncoder.cxx"
 #include "unicodeLatinMap.cxx"
+#include "vector_double.cxx"
+#include "vector_float.cxx"
 #include "vector_int.cxx"
 #include "vector_string.cxx"
+#include "vector_uchar.cxx"
 #include "win32ArgParser.cxx"

dtool/src/dtoolutil/vector_double.cxx

@@ -13,8 +13,8 @@
 
 #include "vector_double.h"
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE double
 #define NAME vector_double
 

dtool/src/dtoolutil/vector_double.h

@@ -14,19 +14,17 @@
 #ifndef VECTOR_DOUBLE_H
 #define VECTOR_DOUBLE_H
 
-#include "pandabase.h"
-
-#include "pvector.h"
+#include "dtoolbase.h"
 
 /**
  * A vector of doubles.  This class is defined once here, and exported to
- * PANDA.DLL; other packages that want to use a vector of this type (whether
+ * DTOOL.DLL; other packages that want to use a vector of this type (whether
  * they need to export it or not) should include this header file, rather than
  * defining the vector again.
  */
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE double
 #define NAME vector_double
 

dtool/src/dtoolutil/vector_float.cxx

@@ -13,8 +13,8 @@
 
 #include "vector_float.h"
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE float
 #define NAME vector_float
 

dtool/src/dtoolutil/vector_float.h

@@ -14,19 +14,17 @@
 #ifndef VECTOR_FLOAT_H
 #define VECTOR_FLOAT_H
 
-#include "pandabase.h"
-
-#include "pvector.h"
+#include "dtoolbase.h"
 
 /**
  * A vector of floats.  This class is defined once here, and exported to
- * PANDA.DLL; other packages that want to use a vector of this type (whether
+ * DTOOL.DLL; other packages that want to use a vector of this type (whether
  * they need to export it or not) should include this header file, rather than
  * defining the vector again.
  */
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE float
 #define NAME vector_float
 

dtool/src/dtoolutil/vector_stdfloat.h

@@ -14,7 +14,7 @@
 #ifndef VECTOR_STDFLOAT_H
 #define VECTOR_STDFLOAT_H
 
-#include "pandabase.h"
+#include "dtoolbase.h"
 
 #include "vector_double.h"
 #include "vector_float.h"

dtool/src/dtoolutil/vector_uchar.cxx

@@ -13,8 +13,8 @@
 
 #include "vector_uchar.h"
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE unsigned char
 #define NAME vector_uchar
 

dtool/src/dtoolutil/vector_uchar.h

@@ -14,19 +14,17 @@
 #ifndef VECTOR_UCHAR_H
 #define VECTOR_UCHAR_H
 
-#include "pandabase.h"
-
-#include "pvector.h"
+#include "dtoolbase.h"
 
 /**
  * A vector of uchars.  This class is defined once here, and exported to
- * PANDAEXPRESS.DLL; other packages that want to use a vector of this type
+ * DTOOL.DLL; other packages that want to use a vector of this type
  * (whether they need to export it or not) should include this header file,
  * rather than defining the vector again.
  */
 
-#define EXPCL EXPCL_PANDAEXPRESS
-#define EXPTP EXPTP_PANDAEXPRESS
+#define EXPCL EXPCL_DTOOL
+#define EXPTP EXPTP_DTOOL
 #define TYPE unsigned char
 #define NAME vector_uchar
 

panda/src/express/p3express_composite2.cxx

@@ -12,9 +12,6 @@
 #include "threadSafePointerToBase.cxx"
 #include "trueClock.cxx"
 #include "typedReferenceCount.cxx"
-#include "vector_uchar.cxx"
-#include "vector_double.cxx"
-#include "vector_float.cxx"
 #include "virtualFile.cxx"
 #include "virtualFileComposite.cxx"
 #include "virtualFileList.cxx"