TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert non-Windows template export changes from 1.9.x, they're less stable than I thought

Browse Source
This commit is contained in:
rdb 2015-06-06 16:55:33 +02:00
parent 9edf75aa7b
commit 4d46172fba
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/dtoolbase/dtoolbase.h
View File

@ -436,7 +436,7 @@
#define IMPORT_CLASS
#endif
/* "extern template" is now part of the C++11 standard. */
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)
#if defined(WIN32_VC) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)
#define EXPORT_TEMPL
#define IMPORT_TEMPL extern
#else

2
dtool/src/dtoolbase/dtoolbase_cc.h
View File

@ -174,7 +174,7 @@ typedef ios::seekdir ios_seekdir;
# define MOVE(x) x
#endif
#if !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES)
#if defined(WIN32_VC) && !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES)
// This macro must be used to export an instantiated template class
// from a DLL. If the template class name itself contains commas, it
// may be necessary to first define a macro for the class name, to

2
panda/src/display/displayRegion.h
View File

@ -360,8 +360,6 @@ private:
static TypeHandle _type_handle;
};
EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_DISPLAY, EXPTP_PANDA_DISPLAY, epvector<DisplayRegion::Region>);
#include "displayRegion.I"
#endif /* DISPLAYREGION_H */

3
panda/src/egg/eggMorphList.h
View File

@ -65,9 +65,6 @@ private:
Morphs _morphs;
};
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorph<LVector3d> >);
EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList<EggMorph<LVector4> >);
typedef EggMorphList<EggMorphVertex> EggMorphVertexList;
typedef EggMorphList<EggMorphNormal> EggMorphNormalList;
typedef EggMorphList<EggMorphTexCoord> EggMorphTexCoordList;

2
panda/src/gobj/shader.h
View File

@ -607,8 +607,6 @@ private:
static TypeHandle _type_handle;
};
EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ, epvector<Shader::ShaderMatSpec>);
#include "shader.I"
#endif