mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 19:08:55 -04:00
unknown alloc
This commit is contained in:
parent
8aefcb0452
commit
eb59c15023
@ -60,15 +60,25 @@ EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, VV_BASE)
|
|||||||
|
|
||||||
// Now we can export the vector class.
|
// Now we can export the vector class.
|
||||||
#pragma warning (disable : 4231)
|
#pragma warning (disable : 4231)
|
||||||
|
|
||||||
|
#ifdef UNKNOWN_ALLOCATOR
|
||||||
|
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
|
||||||
|
#else
|
||||||
#define STD_VECTOR std::vector<TYPE, pallocator<TYPE> >
|
#define STD_VECTOR std::vector<TYPE, pallocator<TYPE> >
|
||||||
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, STD_VECTOR)
|
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, STD_VECTOR)
|
||||||
#undef STD_VECTOR
|
#undef STD_VECTOR
|
||||||
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, pvector<TYPE>)
|
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, pvector<TYPE>)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Now make a typedef for the vector.
|
// Now make a typedef for the vector.
|
||||||
|
|
||||||
|
#ifdef UNKNOWN_ALLOCATOR
|
||||||
|
typedef std::vector<TYPE> NAME;
|
||||||
|
#else
|
||||||
typedef pvector<TYPE> NAME;
|
typedef pvector<TYPE> NAME;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Finally, we must define a non-inline function that performs the
|
// Finally, we must define a non-inline function that performs the
|
||||||
// insert operation given a range of pointers. We do this because
|
// insert operation given a range of pointers. We do this because
|
||||||
|
Loading…
x
Reference in New Issue
Block a user