Jelajahi Sumber

unknown alloc

cxgeorge 24 tahun lalu
induk
melakukan
eb59c15023
1 mengubah file dengan 10 tambahan dan 0 penghapusan
  1. 10 0
      dtool/src/dtoolutil/vector_src.h

+ 10 - 0
dtool/src/dtoolutil/vector_src.h

@@ -60,15 +60,25 @@ EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, VV_BASE)
 
 // Now we can export the vector class.
 #pragma warning (disable : 4231)
+
+#ifdef UNKNOWN_ALLOCATOR
+EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
+#else
 #define STD_VECTOR std::vector<TYPE, pallocator<TYPE> >
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, STD_VECTOR)
 #undef STD_VECTOR
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, pvector<TYPE>)
+#endif
 
 #endif
 
 // Now make a typedef for the vector.
+
+#ifdef UNKNOWN_ALLOCATOR
+typedef std::vector<TYPE> NAME;
+#else
 typedef pvector<TYPE> NAME;
+#endif
 
   // Finally, we must define a non-inline function that performs the
   // insert operation given a range of pointers.  We do this because