Browse Source

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

rdb 10 years ago
parent
commit
4d46172fba

+ 1 - 1
dtool/src/dtoolbase/dtoolbase.h

@@ -436,7 +436,7 @@
 #define IMPORT_CLASS
 #define IMPORT_CLASS
 #endif
 #endif
 /* "extern template" is now part of the C++11 standard. */
 /* "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 EXPORT_TEMPL
 #define IMPORT_TEMPL extern
 #define IMPORT_TEMPL extern
 #else
 #else

+ 1 - 1
dtool/src/dtoolbase/dtoolbase_cc.h

@@ -174,7 +174,7 @@ typedef ios::seekdir ios_seekdir;
 #  define MOVE(x) x
 #  define MOVE(x) x
 #endif
 #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
 // This macro must be used to export an instantiated template class
 // from a DLL.  If the template class name itself contains commas, it
 // 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
 // may be necessary to first define a macro for the class name, to

+ 0 - 2
panda/src/display/displayRegion.h

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

+ 0 - 3
panda/src/egg/eggMorphList.h

@@ -65,9 +65,6 @@ private:
   Morphs _morphs;
   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<EggMorphVertex> EggMorphVertexList;
 typedef EggMorphList<EggMorphNormal> EggMorphNormalList;
 typedef EggMorphList<EggMorphNormal> EggMorphNormalList;
 typedef EggMorphList<EggMorphTexCoord> EggMorphTexCoordList;
 typedef EggMorphList<EggMorphTexCoord> EggMorphTexCoordList;

+ 0 - 2
panda/src/gobj/shader.h

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