From cfd70ebeadd15074f00b3266cc1a1629014cf5fd Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Mon, 19 Mar 2018 21:41:23 -0600 Subject: [PATCH] general: Remove '#pragma interface'/'#pragma implementation' The GCC documentation states that, as of GCC 2.7.2, these aren't necessary for proper program behavior. The documentation further discourages their use because they don't suppress unnecessary code duplication. The Panda codebase these days uses "extern template class" instead, which tells the compiler not to perform implicit template expansion because an explicit template expansion is available for linking elsewhere in the program. This is a more compiler-neutral way of achieving the same thing as '#pragma interface', making '#pragma interface' not only redundant, it could also mask problems in the "extern template class" machinery. --- dtool/src/dtoolutil/vector_double.cxx | 5 ----- dtool/src/dtoolutil/vector_double.h | 5 ----- dtool/src/dtoolutil/vector_float.cxx | 5 ----- dtool/src/dtoolutil/vector_float.h | 5 ----- dtool/src/dtoolutil/vector_int.cxx | 5 ----- dtool/src/dtoolutil/vector_int.h | 5 ----- dtool/src/dtoolutil/vector_string.cxx | 5 ----- dtool/src/dtoolutil/vector_string.h | 5 ----- dtool/src/dtoolutil/vector_uchar.cxx | 5 ----- dtool/src/dtoolutil/vector_uchar.h | 5 ----- panda/src/chan/animChannel.cxx | 5 ----- panda/src/chan/animChannel.h | 6 ------ panda/src/chan/movingPartMatrix.cxx | 5 ----- panda/src/chan/movingPartMatrix.h | 5 ----- panda/src/chan/movingPartScalar.cxx | 5 ----- panda/src/chan/movingPartScalar.h | 5 ----- panda/src/chan/vector_PartGroupStar.cxx | 5 ----- panda/src/chan/vector_PartGroupStar.h | 5 ----- panda/src/display/graphicsWindowInputDevice.cxx | 5 ----- panda/src/display/graphicsWindowInputDevice.h | 5 ----- panda/src/egg/pt_EggMaterial.cxx | 5 ----- panda/src/egg/pt_EggMaterial.h | 5 ----- panda/src/egg/pt_EggTexture.cxx | 5 ----- panda/src/egg/pt_EggTexture.h | 5 ----- panda/src/egg/pt_EggVertex.cxx | 5 ----- panda/src/egg/pt_EggVertex.h | 5 ----- panda/src/egg/vector_PT_EggMaterial.cxx | 5 ----- panda/src/egg/vector_PT_EggMaterial.h | 5 ----- panda/src/egg/vector_PT_EggTexture.cxx | 5 ----- panda/src/egg/vector_PT_EggTexture.h | 5 ----- panda/src/egg/vector_PT_EggVertex.cxx | 5 ----- panda/src/egg/vector_PT_EggVertex.h | 5 ----- panda/src/event/eventParameter.cxx | 5 ----- panda/src/event/eventParameter.h | 5 ----- panda/src/event/pt_Event.cxx | 5 ----- panda/src/event/pt_Event.h | 5 ----- panda/src/express/pta_double.cxx | 5 ----- panda/src/express/pta_double.h | 5 ----- panda/src/express/pta_float.cxx | 5 ----- panda/src/express/pta_float.h | 5 ----- panda/src/express/pta_int.cxx | 5 ----- panda/src/express/pta_int.h | 5 ----- panda/src/express/pta_uchar.cxx | 5 ----- panda/src/express/pta_uchar.h | 5 ----- panda/src/mathutil/linmath_events.cxx | 5 ----- panda/src/mathutil/linmath_events.h | 5 ----- panda/src/mathutil/pta_LMatrix3.cxx | 5 ----- panda/src/mathutil/pta_LMatrix3.h | 5 ----- panda/src/mathutil/pta_LMatrix4.cxx | 5 ----- panda/src/mathutil/pta_LMatrix4.h | 5 ----- panda/src/mathutil/pta_LVecBase2.cxx | 5 ----- panda/src/mathutil/pta_LVecBase2.h | 5 ----- panda/src/mathutil/pta_LVecBase3.cxx | 5 ----- panda/src/mathutil/pta_LVecBase3.h | 5 ----- panda/src/mathutil/pta_LVecBase4.cxx | 5 ----- panda/src/mathutil/pta_LVecBase4.h | 5 ----- panda/src/putil/bitMask.cxx | 5 ----- panda/src/putil/bitMask.h | 5 ----- panda/src/putil/doubleBitMask.cxx | 5 ----- panda/src/putil/doubleBitMask.h | 5 ----- panda/src/putil/paramValue.cxx | 5 ----- panda/src/putil/paramValue.h | 5 ----- panda/src/putil/pta_ushort.cxx | 5 ----- panda/src/putil/pta_ushort.h | 5 ----- panda/src/putil/vector_typedWritable.cxx | 5 ----- panda/src/putil/vector_typedWritable.h | 5 ----- panda/src/putil/vector_ulong.cxx | 5 ----- panda/src/putil/vector_ulong.h | 5 ----- panda/src/putil/vector_ushort.cxx | 5 ----- panda/src/putil/vector_ushort.h | 5 ----- panda/src/putil/vector_writable.cxx | 5 ----- panda/src/putil/vector_writable.h | 5 ----- 72 files changed, 361 deletions(-) diff --git a/dtool/src/dtoolutil/vector_double.cxx b/dtool/src/dtoolutil/vector_double.cxx index a6def549af..e275c5ac8c 100644 --- a/dtool/src/dtoolutil/vector_double.cxx +++ b/dtool/src/dtoolutil/vector_double.cxx @@ -19,8 +19,3 @@ #define NAME vector_double #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/dtool/src/dtoolutil/vector_double.h b/dtool/src/dtoolutil/vector_double.h index 6757bddc7a..5e00afd598 100644 --- a/dtool/src/dtoolutil/vector_double.h +++ b/dtool/src/dtoolutil/vector_double.h @@ -30,9 +30,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/dtool/src/dtoolutil/vector_float.cxx b/dtool/src/dtoolutil/vector_float.cxx index a84b030a56..3d2d1233c5 100644 --- a/dtool/src/dtoolutil/vector_float.cxx +++ b/dtool/src/dtoolutil/vector_float.cxx @@ -19,8 +19,3 @@ #define NAME vector_float #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/dtool/src/dtoolutil/vector_float.h b/dtool/src/dtoolutil/vector_float.h index 36d9f200f9..b9033a5ce7 100644 --- a/dtool/src/dtoolutil/vector_float.h +++ b/dtool/src/dtoolutil/vector_float.h @@ -30,9 +30,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/dtool/src/dtoolutil/vector_int.cxx b/dtool/src/dtoolutil/vector_int.cxx index 1bb9423b7e..3032da29f4 100644 --- a/dtool/src/dtoolutil/vector_int.cxx +++ b/dtool/src/dtoolutil/vector_int.cxx @@ -19,8 +19,3 @@ #define NAME vector_int #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/dtool/src/dtoolutil/vector_int.h b/dtool/src/dtoolutil/vector_int.h index 56436a956f..b149c3ddd3 100644 --- a/dtool/src/dtoolutil/vector_int.h +++ b/dtool/src/dtoolutil/vector_int.h @@ -30,9 +30,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/dtool/src/dtoolutil/vector_string.cxx b/dtool/src/dtoolutil/vector_string.cxx index 0e5df2ce1d..72239b28ac 100644 --- a/dtool/src/dtoolutil/vector_string.cxx +++ b/dtool/src/dtoolutil/vector_string.cxx @@ -19,8 +19,3 @@ #define NAME vector_string #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/dtool/src/dtoolutil/vector_string.h b/dtool/src/dtoolutil/vector_string.h index d34ab7b301..117baf8543 100644 --- a/dtool/src/dtoolutil/vector_string.h +++ b/dtool/src/dtoolutil/vector_string.h @@ -30,9 +30,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/dtool/src/dtoolutil/vector_uchar.cxx b/dtool/src/dtoolutil/vector_uchar.cxx index 07434032dd..e3473584d4 100644 --- a/dtool/src/dtoolutil/vector_uchar.cxx +++ b/dtool/src/dtoolutil/vector_uchar.cxx @@ -19,8 +19,3 @@ #define NAME vector_uchar #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/dtool/src/dtoolutil/vector_uchar.h b/dtool/src/dtoolutil/vector_uchar.h index 608472ae7e..bf8d989990 100644 --- a/dtool/src/dtoolutil/vector_uchar.h +++ b/dtool/src/dtoolutil/vector_uchar.h @@ -30,9 +30,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/chan/animChannel.cxx b/panda/src/chan/animChannel.cxx index 66fc1329f4..dfaf152b7b 100644 --- a/panda/src/chan/animChannel.cxx +++ b/panda/src/chan/animChannel.cxx @@ -15,11 +15,6 @@ #include "compose_matrix.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class AnimChannel; template class AnimChannel; diff --git a/panda/src/chan/animChannel.h b/panda/src/chan/animChannel.h index 1c7fd639fc..4137196f52 100644 --- a/panda/src/chan/animChannel.h +++ b/panda/src/chan/animChannel.h @@ -122,10 +122,4 @@ typedef AnimChannel AnimChannelScalar; #include "animChannel.I" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index 29ed1f79be..6477728e0d 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -21,11 +21,6 @@ #include "bamWriter.h" #include "config_chan.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class MovingPart; TypeHandle MovingPartMatrix::_type_handle; diff --git a/panda/src/chan/movingPartMatrix.h b/panda/src/chan/movingPartMatrix.h index 78352423fc..3c232e63d0 100644 --- a/panda/src/chan/movingPartMatrix.h +++ b/panda/src/chan/movingPartMatrix.h @@ -72,9 +72,4 @@ private: #include "movingPartMatrix.I" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index ed49cddf63..abebb49a32 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -19,11 +19,6 @@ #include "bamWriter.h" #include "config_chan.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class MovingPart; TypeHandle MovingPartScalar::_type_handle; diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h index 5e45e95e4a..90bd049ee5 100644 --- a/panda/src/chan/movingPartScalar.h +++ b/panda/src/chan/movingPartScalar.h @@ -70,9 +70,4 @@ private: #include "movingPartScalar.I" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/chan/vector_PartGroupStar.cxx b/panda/src/chan/vector_PartGroupStar.cxx index e0f6554731..d31dd613bb 100644 --- a/panda/src/chan/vector_PartGroupStar.cxx +++ b/panda/src/chan/vector_PartGroupStar.cxx @@ -19,8 +19,3 @@ #define NAME vector_PartGroupStar #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/chan/vector_PartGroupStar.h b/panda/src/chan/vector_PartGroupStar.h index 988635dc33..4e5098a8a8 100644 --- a/panda/src/chan/vector_PartGroupStar.h +++ b/panda/src/chan/vector_PartGroupStar.h @@ -32,9 +32,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/display/graphicsWindowInputDevice.cxx b/panda/src/display/graphicsWindowInputDevice.cxx index 4e0b0a08c2..89d6e9d5b4 100644 --- a/panda/src/display/graphicsWindowInputDevice.cxx +++ b/panda/src/display/graphicsWindowInputDevice.cxx @@ -23,11 +23,6 @@ #include "vector_src.cxx" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - /** * Defines a new InputDevice for the window. Most windows will have exactly * one InputDevice: a keyboard/mouse pair. Some may also add joystick data, diff --git a/panda/src/display/graphicsWindowInputDevice.h b/panda/src/display/graphicsWindowInputDevice.h index 7523ea7e91..5cdff54f29 100644 --- a/panda/src/display/graphicsWindowInputDevice.h +++ b/panda/src/display/graphicsWindowInputDevice.h @@ -142,9 +142,4 @@ private: #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/pt_EggMaterial.cxx b/panda/src/egg/pt_EggMaterial.cxx index 2750824e5a..af0ae82e6f 100644 --- a/panda/src/egg/pt_EggMaterial.cxx +++ b/panda/src/egg/pt_EggMaterial.cxx @@ -13,11 +13,6 @@ #include "pt_EggMaterial.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase; template class PointerTo; template class ConstPointerTo; diff --git a/panda/src/egg/pt_EggMaterial.h b/panda/src/egg/pt_EggMaterial.h index 218de12074..7c5e5f083e 100644 --- a/panda/src/egg/pt_EggMaterial.h +++ b/panda/src/egg/pt_EggMaterial.h @@ -31,9 +31,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, ConstPointerTo PT_EggMaterial; typedef ConstPointerTo CPT_EggMaterial; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/pt_EggTexture.cxx b/panda/src/egg/pt_EggTexture.cxx index 8a90ad2a24..ea2336996f 100644 --- a/panda/src/egg/pt_EggTexture.cxx +++ b/panda/src/egg/pt_EggTexture.cxx @@ -13,11 +13,6 @@ #include "pt_EggTexture.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase; template class PointerTo; template class ConstPointerTo; diff --git a/panda/src/egg/pt_EggTexture.h b/panda/src/egg/pt_EggTexture.h index 15a9738f96..bc61025fb6 100644 --- a/panda/src/egg/pt_EggTexture.h +++ b/panda/src/egg/pt_EggTexture.h @@ -31,9 +31,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, ConstPointerTo typedef PointerTo PT_EggTexture; typedef ConstPointerTo CPT_EggTexture; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/pt_EggVertex.cxx b/panda/src/egg/pt_EggVertex.cxx index b1b932328b..9c974e8e63 100644 --- a/panda/src/egg/pt_EggVertex.cxx +++ b/panda/src/egg/pt_EggVertex.cxx @@ -13,11 +13,6 @@ #include "pt_EggVertex.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase; template class PointerTo; template class ConstPointerTo; diff --git a/panda/src/egg/pt_EggVertex.h b/panda/src/egg/pt_EggVertex.h index 483a893a13..5c2922b51d 100644 --- a/panda/src/egg/pt_EggVertex.h +++ b/panda/src/egg/pt_EggVertex.h @@ -31,9 +31,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, ConstPointerTo) typedef PointerTo PT_EggVertex; typedef ConstPointerTo CPT_EggVertex; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/vector_PT_EggMaterial.cxx b/panda/src/egg/vector_PT_EggMaterial.cxx index ce183b5aa0..d504d36ca9 100644 --- a/panda/src/egg/vector_PT_EggMaterial.cxx +++ b/panda/src/egg/vector_PT_EggMaterial.cxx @@ -19,8 +19,3 @@ #define NAME vector_PT_EggMaterial #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/egg/vector_PT_EggMaterial.h b/panda/src/egg/vector_PT_EggMaterial.h index 0aaab728a7..0878ba71c0 100644 --- a/panda/src/egg/vector_PT_EggMaterial.h +++ b/panda/src/egg/vector_PT_EggMaterial.h @@ -35,9 +35,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/vector_PT_EggTexture.cxx b/panda/src/egg/vector_PT_EggTexture.cxx index f95063202e..bdd2acf2da 100644 --- a/panda/src/egg/vector_PT_EggTexture.cxx +++ b/panda/src/egg/vector_PT_EggTexture.cxx @@ -19,8 +19,3 @@ #define NAME vector_PT_EggTexture #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/egg/vector_PT_EggTexture.h b/panda/src/egg/vector_PT_EggTexture.h index 44849ec364..12d5f91212 100644 --- a/panda/src/egg/vector_PT_EggTexture.h +++ b/panda/src/egg/vector_PT_EggTexture.h @@ -35,9 +35,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/egg/vector_PT_EggVertex.cxx b/panda/src/egg/vector_PT_EggVertex.cxx index 0343a4771b..61deffdeac 100644 --- a/panda/src/egg/vector_PT_EggVertex.cxx +++ b/panda/src/egg/vector_PT_EggVertex.cxx @@ -19,8 +19,3 @@ #define NAME vector_PT_EggVertex #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/egg/vector_PT_EggVertex.h b/panda/src/egg/vector_PT_EggVertex.h index 6827f35783..8d04bccc17 100644 --- a/panda/src/egg/vector_PT_EggVertex.h +++ b/panda/src/egg/vector_PT_EggVertex.h @@ -35,9 +35,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/event/eventParameter.cxx b/panda/src/event/eventParameter.cxx index 45780e5ff0..e5e55a1bac 100644 --- a/panda/src/event/eventParameter.cxx +++ b/panda/src/event/eventParameter.cxx @@ -14,11 +14,6 @@ #include "eventParameter.h" #include "dcast.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class ParamValue; template class ParamValue; diff --git a/panda/src/event/eventParameter.h b/panda/src/event/eventParameter.h index b0cbcc1376..65dbf550c8 100644 --- a/panda/src/event/eventParameter.h +++ b/panda/src/event/eventParameter.h @@ -86,9 +86,4 @@ typedef ParamWstring EventStoreWstring; #include "eventParameter.I" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/event/pt_Event.cxx b/panda/src/event/pt_Event.cxx index 095ce8b56b..66b4897052 100644 --- a/panda/src/event/pt_Event.cxx +++ b/panda/src/event/pt_Event.cxx @@ -13,11 +13,6 @@ #include "pt_Event.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase; template class PointerTo; template class ConstPointerTo; diff --git a/panda/src/event/pt_Event.h b/panda/src/event/pt_Event.h index 6c59b8fecd..ce5d8cea39 100644 --- a/panda/src/event/pt_Event.h +++ b/panda/src/event/pt_Event.h @@ -32,9 +32,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_EVENT, EXPTP_PANDA_EVENT, ConstPointerTo PT_Event; typedef ConstPointerTo CPT_Event; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/express/pta_double.cxx b/panda/src/express/pta_double.cxx index efb3ec3086..0acc113075 100644 --- a/panda/src/express/pta_double.cxx +++ b/panda/src/express/pta_double.cxx @@ -13,11 +13,6 @@ #include "pta_double.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/express/pta_double.h b/panda/src/express/pta_double.h index 2cb239513f..4db51677eb 100644 --- a/panda/src/express/pta_double.h +++ b/panda/src/express/pta_double.h @@ -34,9 +34,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArra typedef PointerToArray PTA_double; typedef ConstPointerToArray CPTA_double; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/express/pta_float.cxx b/panda/src/express/pta_float.cxx index 3d75ca4ac4..f1cfd87a64 100644 --- a/panda/src/express/pta_float.cxx +++ b/panda/src/express/pta_float.cxx @@ -13,11 +13,6 @@ #include "pta_float.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/express/pta_float.h b/panda/src/express/pta_float.h index b2f14953f9..fd84774654 100644 --- a/panda/src/express/pta_float.h +++ b/panda/src/express/pta_float.h @@ -34,9 +34,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArra typedef PointerToArray PTA_float; typedef ConstPointerToArray CPTA_float; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/express/pta_int.cxx b/panda/src/express/pta_int.cxx index 417838605c..6dab4d03c8 100644 --- a/panda/src/express/pta_int.cxx +++ b/panda/src/express/pta_int.cxx @@ -13,11 +13,6 @@ #include "pta_int.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/express/pta_int.h b/panda/src/express/pta_int.h index 16a2c504e3..93ed0bb900 100644 --- a/panda/src/express/pta_int.h +++ b/panda/src/express/pta_int.h @@ -34,9 +34,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArra typedef PointerToArray PTA_int; typedef ConstPointerToArray CPTA_int; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/express/pta_uchar.cxx b/panda/src/express/pta_uchar.cxx index 58b4b508c0..919eb2bc14 100644 --- a/panda/src/express/pta_uchar.cxx +++ b/panda/src/express/pta_uchar.cxx @@ -13,11 +13,6 @@ #include "pta_uchar.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/express/pta_uchar.h b/panda/src/express/pta_uchar.h index 5715480cd8..1552c6bcab 100644 --- a/panda/src/express/pta_uchar.h +++ b/panda/src/express/pta_uchar.h @@ -38,9 +38,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArra typedef PointerToArray PTA_uchar; typedef ConstPointerToArray CPTA_uchar; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/linmath_events.cxx b/panda/src/mathutil/linmath_events.cxx index a116cc696a..8dba9c22a4 100644 --- a/panda/src/mathutil/linmath_events.cxx +++ b/panda/src/mathutil/linmath_events.cxx @@ -12,8 +12,3 @@ */ #include "linmath_events.h" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/mathutil/linmath_events.h b/panda/src/mathutil/linmath_events.h index d5d3cea907..aec3436316 100644 --- a/panda/src/mathutil/linmath_events.h +++ b/panda/src/mathutil/linmath_events.h @@ -27,9 +27,4 @@ typedef ParamVecBase2 EventStoreVec2; typedef ParamVecBase3 EventStoreVec3; typedef ParamMatrix4 EventStoreMat4; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/pta_LMatrix3.cxx b/panda/src/mathutil/pta_LMatrix3.cxx index e6a273a9fb..fb761a54d7 100644 --- a/panda/src/mathutil/pta_LMatrix3.cxx +++ b/panda/src/mathutil/pta_LMatrix3.cxx @@ -13,11 +13,6 @@ #include "pta_LMatrix3.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/mathutil/pta_LMatrix3.h b/panda/src/mathutil/pta_LMatrix3.h index ccd88e156c..3b0de0672b 100644 --- a/panda/src/mathutil/pta_LMatrix3.h +++ b/panda/src/mathutil/pta_LMatrix3.h @@ -64,9 +64,4 @@ typedef PTA_LMatrix3d PTAMat3d; typedef CPTA_LMatrix3d CPTAMat3d; #endif // CPPPARSER -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/pta_LMatrix4.cxx b/panda/src/mathutil/pta_LMatrix4.cxx index 02ba4d48da..11b70bef07 100644 --- a/panda/src/mathutil/pta_LMatrix4.cxx +++ b/panda/src/mathutil/pta_LMatrix4.cxx @@ -13,11 +13,6 @@ #include "pta_LMatrix4.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/mathutil/pta_LMatrix4.h b/panda/src/mathutil/pta_LMatrix4.h index ef5888b465..61ba1495ff 100644 --- a/panda/src/mathutil/pta_LMatrix4.h +++ b/panda/src/mathutil/pta_LMatrix4.h @@ -70,9 +70,4 @@ typedef PTA_LMatrix4d PTAMat4d; typedef CPTA_LMatrix4d CPTAMat4d; #endif // CPPPARSER -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/pta_LVecBase2.cxx b/panda/src/mathutil/pta_LVecBase2.cxx index 6c232034df..0f631c452f 100644 --- a/panda/src/mathutil/pta_LVecBase2.cxx +++ b/panda/src/mathutil/pta_LVecBase2.cxx @@ -13,11 +13,6 @@ #include "pta_LVecBase2.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/mathutil/pta_LVecBase2.h b/panda/src/mathutil/pta_LVecBase2.h index b4296df5da..2d87312cd1 100644 --- a/panda/src/mathutil/pta_LVecBase2.h +++ b/panda/src/mathutil/pta_LVecBase2.h @@ -79,9 +79,4 @@ typedef PTA_LVecBase2d PTAVecBase2d; typedef CPTA_LVecBase2d CPTAVecBase2d; #endif // CPPPARSER -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/pta_LVecBase3.cxx b/panda/src/mathutil/pta_LVecBase3.cxx index 7248c2638c..501fd86cf6 100644 --- a/panda/src/mathutil/pta_LVecBase3.cxx +++ b/panda/src/mathutil/pta_LVecBase3.cxx @@ -13,11 +13,6 @@ #include "pta_LVecBase3.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/mathutil/pta_LVecBase3.h b/panda/src/mathutil/pta_LVecBase3.h index f883e1acbb..73492e26d6 100644 --- a/panda/src/mathutil/pta_LVecBase3.h +++ b/panda/src/mathutil/pta_LVecBase3.h @@ -79,9 +79,4 @@ typedef PTA_LVecBase3d PTAVecBase3d; typedef CPTA_LVecBase3d CPTAVecBase3d; #endif // CPPPARSER -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/mathutil/pta_LVecBase4.cxx b/panda/src/mathutil/pta_LVecBase4.cxx index b06d7340a4..a638ebdd22 100644 --- a/panda/src/mathutil/pta_LVecBase4.cxx +++ b/panda/src/mathutil/pta_LVecBase4.cxx @@ -13,11 +13,6 @@ #include "pta_LVecBase4.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/mathutil/pta_LVecBase4.h b/panda/src/mathutil/pta_LVecBase4.h index 0d966002c0..e62351ca4a 100644 --- a/panda/src/mathutil/pta_LVecBase4.h +++ b/panda/src/mathutil/pta_LVecBase4.h @@ -88,9 +88,4 @@ typedef PTA_LVecBase4d PTAVecBase4d; typedef CPTA_LVecBase4d CPTAVecBase4d; #endif // CPPPARSER -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/bitMask.cxx b/panda/src/putil/bitMask.cxx index 385d773695..8e51315eb2 100644 --- a/panda/src/putil/bitMask.cxx +++ b/panda/src/putil/bitMask.cxx @@ -13,11 +13,6 @@ #include "bitMask.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class BitMask; template class BitMask; template class BitMask; diff --git a/panda/src/putil/bitMask.h b/panda/src/putil/bitMask.h index ff9b15db97..5333562025 100644 --- a/panda/src/putil/bitMask.h +++ b/panda/src/putil/bitMask.h @@ -172,9 +172,4 @@ typedef BitMask64 BitMaskNative; #error No definition for NATIVE_WORDSIZE--should be defined in dtoolbase.h. #endif // NATIVE_WORDSIZE -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/doubleBitMask.cxx b/panda/src/putil/doubleBitMask.cxx index 7d68b48dbe..c35d11613a 100644 --- a/panda/src/putil/doubleBitMask.cxx +++ b/panda/src/putil/doubleBitMask.cxx @@ -13,10 +13,5 @@ #include "doubleBitMask.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class DoubleBitMask; template class DoubleBitMask; diff --git a/panda/src/putil/doubleBitMask.h b/panda/src/putil/doubleBitMask.h index 3b3f521ec2..d229eb03a6 100644 --- a/panda/src/putil/doubleBitMask.h +++ b/panda/src/putil/doubleBitMask.h @@ -144,9 +144,4 @@ typedef DoubleBitMask DoubleBitMaskNative; EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, DoubleBitMask); typedef DoubleBitMask QuadBitMaskNative; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/paramValue.cxx b/panda/src/putil/paramValue.cxx index e2ee6dadf1..6937a27faa 100644 --- a/panda/src/putil/paramValue.cxx +++ b/panda/src/putil/paramValue.cxx @@ -14,11 +14,6 @@ #include "paramValue.h" #include "dcast.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class ParamValue; template class ParamValue; diff --git a/panda/src/putil/paramValue.h b/panda/src/putil/paramValue.h index a75b4360b3..b17b2c9c37 100644 --- a/panda/src/putil/paramValue.h +++ b/panda/src/putil/paramValue.h @@ -209,9 +209,4 @@ typedef ParamMatrix3f ParamMatrix3; typedef ParamMatrix4f ParamMatrix4; #endif -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/pta_ushort.cxx b/panda/src/putil/pta_ushort.cxx index 6323614b99..6163184397 100644 --- a/panda/src/putil/pta_ushort.cxx +++ b/panda/src/putil/pta_ushort.cxx @@ -13,11 +13,6 @@ #include "pta_ushort.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif - template class PointerToBase >; template class PointerToArrayBase; template class PointerToArray; diff --git a/panda/src/putil/pta_ushort.h b/panda/src/putil/pta_ushort.h index 51bf61927d..6424ddb237 100644 --- a/panda/src/putil/pta_ushort.h +++ b/panda/src/putil/pta_ushort.h @@ -34,9 +34,4 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray< typedef PointerToArray PTA_ushort; typedef ConstPointerToArray CPTA_ushort; -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/vector_typedWritable.cxx b/panda/src/putil/vector_typedWritable.cxx index 7c306f959f..8759e17d13 100644 --- a/panda/src/putil/vector_typedWritable.cxx +++ b/panda/src/putil/vector_typedWritable.cxx @@ -19,8 +19,3 @@ #define NAME vector_typedWritable #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/putil/vector_typedWritable.h b/panda/src/putil/vector_typedWritable.h index 61e87d19fa..9648c6ef58 100644 --- a/panda/src/putil/vector_typedWritable.h +++ b/panda/src/putil/vector_typedWritable.h @@ -34,9 +34,4 @@ class TypedWritable; #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/vector_ulong.cxx b/panda/src/putil/vector_ulong.cxx index 58f63aed5c..930b461e31 100644 --- a/panda/src/putil/vector_ulong.cxx +++ b/panda/src/putil/vector_ulong.cxx @@ -19,8 +19,3 @@ #define NAME vector_ulong #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/putil/vector_ulong.h b/panda/src/putil/vector_ulong.h index 7f86a91d4d..c7a3ba2a6e 100644 --- a/panda/src/putil/vector_ulong.h +++ b/panda/src/putil/vector_ulong.h @@ -32,9 +32,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/vector_ushort.cxx b/panda/src/putil/vector_ushort.cxx index 274aa9bed0..fd7252ad52 100644 --- a/panda/src/putil/vector_ushort.cxx +++ b/panda/src/putil/vector_ushort.cxx @@ -19,8 +19,3 @@ #define NAME vector_ushort #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/putil/vector_ushort.h b/panda/src/putil/vector_ushort.h index f336da3236..3ec5c7d07b 100644 --- a/panda/src/putil/vector_ushort.h +++ b/panda/src/putil/vector_ushort.h @@ -32,9 +32,4 @@ #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif diff --git a/panda/src/putil/vector_writable.cxx b/panda/src/putil/vector_writable.cxx index 3faefc0c2f..ce7fb138c3 100644 --- a/panda/src/putil/vector_writable.cxx +++ b/panda/src/putil/vector_writable.cxx @@ -18,8 +18,3 @@ #define NAME vector_writable #include "vector_src.cxx" - -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma implementation -#endif diff --git a/panda/src/putil/vector_writable.h b/panda/src/putil/vector_writable.h index 8d3fd4b46a..9825ed40ad 100644 --- a/panda/src/putil/vector_writable.h +++ b/panda/src/putil/vector_writable.h @@ -34,9 +34,4 @@ class Writable; #include "vector_src.h" -// Tell GCC that we'll take care of the instantiation explicitly here. -#ifdef __GNUC__ -#pragma interface -#endif - #endif