mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
oops
This commit is contained in:
parent
672e4f6710
commit
6b574fdb8d
@ -61,7 +61,7 @@ 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
|
#ifdef NO_STYLE_ALLOCATOR
|
||||||
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
|
EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
|
||||||
#else
|
#else
|
||||||
#define STD_VECTOR std::vector<TYPE, pallocator<TYPE> >
|
#define STD_VECTOR std::vector<TYPE, pallocator<TYPE> >
|
||||||
@ -74,7 +74,7 @@ EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, pvector<TYPE>)
|
|||||||
|
|
||||||
// Now make a typedef for the vector.
|
// Now make a typedef for the vector.
|
||||||
|
|
||||||
#ifdef UNKNOWN_ALLOCATOR
|
#ifdef NO_STYLE_ALLOCATOR
|
||||||
typedef std::vector<TYPE> NAME;
|
typedef std::vector<TYPE> NAME;
|
||||||
#else
|
#else
|
||||||
typedef pvector<TYPE> NAME;
|
typedef pvector<TYPE> NAME;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user