From 1bc98e49cd20aeb0bc85aa12dfe6d9d2f39aa872 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Tue, 5 Feb 2002 02:57:42 +0000 Subject: [PATCH] eliminate erroneous export of template class --- panda/src/chan/animChannel.h | 4 +--- panda/src/chan/animChannelFixed.h | 2 +- panda/src/chan/movingPart.h | 2 +- panda/src/char/computedVerticesMorph.h | 6 +----- panda/src/egg2sg/computedVerticesMakerEntity.h | 4 ++-- panda/src/express/referenceCount.h | 4 ++-- panda/src/graph/traverserVisitor.h | 2 +- panda/src/putil/iterator_types.h | 6 +++--- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/panda/src/chan/animChannel.h b/panda/src/chan/animChannel.h index 0c0674dc85..4cc8a4685b 100644 --- a/panda/src/chan/animChannel.h +++ b/panda/src/chan/animChannel.h @@ -31,7 +31,7 @@ // of AnimChannels that return different values. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA AnimChannel : public AnimChannelBase { +class AnimChannel : public AnimChannelBase { protected: // The default constructor is protected: don't try to create an // AnimChannel without a parent. To create an AnimChannel hierarchy, @@ -134,5 +134,3 @@ typedef AnimChannel AnimChannelScalar; #endif - - diff --git a/panda/src/chan/animChannelFixed.h b/panda/src/chan/animChannelFixed.h index 563b4c9dd0..d306110836 100644 --- a/panda/src/chan/animChannelFixed.h +++ b/panda/src/chan/animChannelFixed.h @@ -34,7 +34,7 @@ // anims to bind against. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA AnimChannelFixed : public AnimChannel { +class AnimChannelFixed : public AnimChannel { public: INLINE AnimChannelFixed(AnimGroup *parent, const string &name, const ValueType &value); INLINE AnimChannelFixed(const string &name, const ValueType &value); diff --git a/panda/src/chan/movingPart.h b/panda/src/chan/movingPart.h index bd20342f45..6d1cd11242 100644 --- a/panda/src/chan/movingPart.h +++ b/panda/src/chan/movingPart.h @@ -31,7 +31,7 @@ // channel. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA MovingPart : public MovingPartBase { +class MovingPart : public MovingPartBase { public: typedef TYPENAME SwitchType::ValueType ValueType; typedef AnimChannel ChannelType; diff --git a/panda/src/char/computedVerticesMorph.h b/panda/src/char/computedVerticesMorph.h index 16e7add5c5..36d5b0e905 100644 --- a/panda/src/char/computedVerticesMorph.h +++ b/panda/src/char/computedVerticesMorph.h @@ -101,7 +101,7 @@ public: // of vertex values. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA ComputedVerticesMorph { +class ComputedVerticesMorph { public: INLINE ComputedVerticesMorph(); INLINE ComputedVerticesMorph(const ComputedVerticesMorph ©); @@ -134,7 +134,3 @@ typedef ComputedVerticesMorph ComputedVerti #endif - - - - diff --git a/panda/src/egg2sg/computedVerticesMakerEntity.h b/panda/src/egg2sg/computedVerticesMakerEntity.h index cecfd7b17a..aa3b93bbdb 100644 --- a/panda/src/egg2sg/computedVerticesMakerEntity.h +++ b/panda/src/egg2sg/computedVerticesMakerEntity.h @@ -38,7 +38,7 @@ // values with identical values. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDAEGG ComputedVerticesMakerEntity { +class ComputedVerticesMakerEntity { public: INLINE ComputedVerticesMakerEntity(const ValueType &value, const MorphType &morphs); @@ -57,7 +57,7 @@ public: // vertices into a common index number. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDAEGG ComputedVerticesMakerEntityMap { +class ComputedVerticesMakerEntityMap { public: int add_value(const ValueType &value, const MorphType &morphs, PTA(ValueType) &table); diff --git a/panda/src/express/referenceCount.h b/panda/src/express/referenceCount.h index f8a9fce2b6..595f530d43 100644 --- a/panda/src/express/referenceCount.h +++ b/panda/src/express/referenceCount.h @@ -90,7 +90,7 @@ INLINE void unref_delete(RefCountType *ptr); // typedObject.h. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDAEXPRESS RefCountProxy : public ReferenceCount { +class RefCountProxy : public ReferenceCount { public: INLINE RefCountProxy(); INLINE RefCountProxy(const Base ©); @@ -118,7 +118,7 @@ private: // only works when the base type is, in fact, a class. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDAEXPRESS RefCountObj : public ReferenceCount, public Base { +class RefCountObj : public ReferenceCount, public Base { public: INLINE RefCountObj(); INLINE RefCountObj(const Base ©); diff --git a/panda/src/graph/traverserVisitor.h b/panda/src/graph/traverserVisitor.h index 983213b369..8bc249bb05 100644 --- a/panda/src/graph/traverserVisitor.h +++ b/panda/src/graph/traverserVisitor.h @@ -25,7 +25,7 @@ class Node; class NodeRelation; template -class EXPCL_PANDA TraverserVisitor { +class TraverserVisitor { public: typedef TW TransitionWrapper; diff --git a/panda/src/putil/iterator_types.h b/panda/src/putil/iterator_types.h index a10e241b50..c0163f9fcc 100644 --- a/panda/src/putil/iterator_types.h +++ b/panda/src/putil/iterator_types.h @@ -28,7 +28,7 @@ // that pair. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA first_of_pair_iterator : public pair_iterator { +class first_of_pair_iterator : public pair_iterator { public: typedef TYPENAME pair_iterator::value_type::first_type value_type; @@ -49,7 +49,7 @@ public: // that pair. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA second_of_pair_iterator : public pair_iterator { +class second_of_pair_iterator : public pair_iterator { public: typedef TYPENAME pair_iterator::value_type::second_type value_type; @@ -69,7 +69,7 @@ public: // indicated type. //////////////////////////////////////////////////////////////////// template -class EXPCL_PANDA typecast_iterator : public base_iterator { +class typecast_iterator : public base_iterator { public: typedef new_type value_type;