diff --git a/panda/src/chan/animControlCollection.h b/panda/src/chan/animControlCollection.h index 9ef7636f3b..57d66bd3e2 100644 --- a/panda/src/chan/animControlCollection.h +++ b/panda/src/chan/animControlCollection.h @@ -72,7 +72,7 @@ PUBLISHED: string which_anim_playing() const; private: - typedef map Controls; + typedef map Controls; Controls _controls; CPT_Event _stop_event; AnimControl *_last_started_control; diff --git a/panda/src/chan/animGroup.h b/panda/src/chan/animGroup.h index 25600ecce5..0c72eb9b44 100644 --- a/panda/src/chan/animGroup.h +++ b/panda/src/chan/animGroup.h @@ -49,7 +49,7 @@ protected: void write_descendants(ostream &out, int indent_level) const; protected: - typedef vector Children; + typedef vector< PT(AnimGroup) > Children; Children _children; AnimBundle *_root; diff --git a/panda/src/chan/movingPartBase.h b/panda/src/chan/movingPartBase.h index 7c2f1dc819..b38a29f16d 100644 --- a/panda/src/chan/movingPartBase.h +++ b/panda/src/chan/movingPartBase.h @@ -48,7 +48,7 @@ protected: virtual void pick_channel_index(list &holes, int &next) const; virtual void bind_hierarchy(AnimGroup *anim, int channel_index); - typedef vector Channels; + typedef vector< PT(AnimChannelBase) > Channels; Channels _channels; public: diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h index 351a0609c1..2196e069e2 100644 --- a/panda/src/chan/partGroup.h +++ b/panda/src/chan/partGroup.h @@ -79,7 +79,7 @@ protected: virtual void pick_channel_index(list &holes, int &next) const; virtual void bind_hierarchy(AnimGroup *anim, int channel_index); - typedef vector Children; + typedef vector< PT(PartGroup) > Children; Children _children; public: diff --git a/panda/src/char/characterJoint.h b/panda/src/char/characterJoint.h index 709ca3690a..69ba5f9c3d 100644 --- a/panda/src/char/characterJoint.h +++ b/panda/src/char/characterJoint.h @@ -44,7 +44,7 @@ PUBLISHED: void clear_local_transforms(); private: - typedef set ArcList; + typedef set< PT(NodeRelation) > ArcList; ArcList _net_transform_arcs; ArcList _local_transform_arcs; diff --git a/panda/src/collide/collisionHandlerPhysical.h b/panda/src/collide/collisionHandlerPhysical.h index 9f30d33bc6..3664161c02 100644 --- a/panda/src/collide/collisionHandlerPhysical.h +++ b/panda/src/collide/collisionHandlerPhysical.h @@ -41,7 +41,7 @@ protected: virtual void handle_entries()=0; protected: - typedef vector Entries; + typedef vector< PT(CollisionEntry) > Entries; typedef map FromEntries; FromEntries _from_entries; diff --git a/panda/src/collide/collisionHandlerQueue.h b/panda/src/collide/collisionHandlerQueue.h index 9c623b45c6..fcf23e9584 100644 --- a/panda/src/collide/collisionHandlerQueue.h +++ b/panda/src/collide/collisionHandlerQueue.h @@ -36,7 +36,7 @@ PUBLISHED: CollisionEntry *get_entry(int n) const; private: - typedef vector Entries; + typedef vector< PT(CollisionEntry) > Entries; Entries _entries; public: diff --git a/panda/src/collide/collisionNode.h b/panda/src/collide/collisionNode.h index c006ea27c7..ee7ac94e0b 100644 --- a/panda/src/collide/collisionNode.h +++ b/panda/src/collide/collisionNode.h @@ -59,7 +59,7 @@ private: CollideMask _into_collide_mask; bool _collide_geom; - typedef vector Solids; + typedef vector< PT(CollisionSolid) > Solids; Solids _solids; public: diff --git a/panda/src/collide/collisionSolid.h b/panda/src/collide/collisionSolid.h index 47a329868c..a509f836f8 100644 --- a/panda/src/collide/collisionSolid.h +++ b/panda/src/collide/collisionSolid.h @@ -85,7 +85,7 @@ protected: virtual void recompute_viz(Node *parent)=0; - typedef vector VizArcs; + typedef vector< PT(NodeRelation) > VizArcs; VizArcs _solid_viz_arcs; VizArcs _wireframe_viz_arcs; VizArcs _other_viz_arcs; diff --git a/panda/src/collide/collisionTraverser.h b/panda/src/collide/collisionTraverser.h index c866901d76..afc8ab0d9d 100644 --- a/panda/src/collide/collisionTraverser.h +++ b/panda/src/collide/collisionTraverser.h @@ -81,7 +81,7 @@ private: PT(CollisionHandler) _default_handler; TypeHandle _graph_type; - typedef map Colliders; + typedef map Colliders; Colliders _colliders; typedef vector OrderedColliders; OrderedColliders _ordered_colliders; diff --git a/panda/src/cull/cullStateLookup.h b/panda/src/cull/cullStateLookup.h index 0172c792fd..62979e0a61 100644 --- a/panda/src/cull/cullStateLookup.h +++ b/panda/src/cull/cullStateLookup.h @@ -60,7 +60,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef map CullStates; + typedef map CullStates; CullStates _cull_states; typedef map Subtrees; diff --git a/panda/src/cull/cullTraverser.h b/panda/src/cull/cullTraverser.h index 87a7fd60ef..2a8ae80b86 100644 --- a/panda/src/cull/cullTraverser.h +++ b/panda/src/cull/cullTraverser.h @@ -104,8 +104,8 @@ private: AllAttributesWrapper _initial_state; - typedef map ToplevelBins; - typedef multimap SubBins; + typedef map ToplevelBins; + typedef multimap SubBins; ToplevelBins _toplevel_bins; SubBins _sub_bins; PT(GeomBin) _default_bin; diff --git a/panda/src/cull/geomBinGroup.h b/panda/src/cull/geomBinGroup.h index db226fec0c..99bf18ed87 100644 --- a/panda/src/cull/geomBinGroup.h +++ b/panda/src/cull/geomBinGroup.h @@ -52,7 +52,7 @@ protected: virtual PT(GeomBin) detach(); private: - typedef vector SubBins; + typedef vector< PT(GeomBin) > SubBins; SubBins _sub_bins; public: diff --git a/panda/src/cull/geomBinUnsorted.h b/panda/src/cull/geomBinUnsorted.h index 7ddbe10ef7..1735e1cdbe 100644 --- a/panda/src/cull/geomBinUnsorted.h +++ b/panda/src/cull/geomBinUnsorted.h @@ -39,7 +39,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef vector CullStates; + typedef vector< PT(CullState) > CullStates; CullStates _cull_states; public: diff --git a/panda/src/display/graphicsChannel.h b/panda/src/display/graphicsChannel.h index f1300b41e9..553d7cefba 100644 --- a/panda/src/display/graphicsChannel.h +++ b/panda/src/display/graphicsChannel.h @@ -63,7 +63,7 @@ private: GraphicsWindow *_window; bool _is_active; - typedef vector GraphicsLayers; + typedef vector< PT(GraphicsLayer) > GraphicsLayers; GraphicsLayers _layers; private: diff --git a/panda/src/display/graphicsLayer.h b/panda/src/display/graphicsLayer.h index d501f0a16a..80e51f2523 100644 --- a/panda/src/display/graphicsLayer.h +++ b/panda/src/display/graphicsLayer.h @@ -69,7 +69,7 @@ private: GraphicsChannel *_channel; bool _is_active; - typedef vector DisplayRegions; + typedef vector< PT(DisplayRegion) > DisplayRegions; DisplayRegions _display_regions; private: diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h index 74658d2b73..c4b8694606 100644 --- a/panda/src/display/graphicsPipe.h +++ b/panda/src/display/graphicsPipe.h @@ -103,7 +103,7 @@ protected: private: // Some private type declarations. These must be declared here so // we can declare the public iterator types, below. - typedef vector Windows; + typedef vector< PT(GraphicsWindow) > Windows; typedef vector Pipes; Windows _windows; diff --git a/panda/src/display/graphicsWindow.h b/panda/src/display/graphicsWindow.h index 99451e6de7..a989f738e9 100644 --- a/panda/src/display/graphicsWindow.h +++ b/panda/src/display/graphicsWindow.h @@ -193,7 +193,7 @@ protected: void declare_channel(int index, GraphicsChannel *chan); private: - typedef vector Channels; + typedef vector< PT(GraphicsChannel) > Channels; Channels _channels; public: diff --git a/panda/src/downloader/downloadDb.cxx b/panda/src/downloader/downloadDb.cxx index 36af8f9095..e62db92e15 100644 --- a/panda/src/downloader/downloadDb.cxx +++ b/panda/src/downloader/downloadDb.cxx @@ -292,7 +292,7 @@ server_add_file(string mfname, string fname) { PT(FileRecord) fr = new FileRecord(fname); // Find the multifile with mfname - vector::iterator i = _server_db._mfile_records.begin(); + vector< PT(MultifileRecord) >::iterator i = _server_db._mfile_records.begin(); for(; i != _server_db._mfile_records.end(); ++i) { if (mfname == (*i)->_name) { (*i)->add_file_record(fr); @@ -353,7 +353,7 @@ output(ostream &out) const { << " size: " << _size << endl << " status: " << _status << endl; out << "--------------------------------------------------" << endl; - vector::const_iterator i = _file_records.begin(); + vector< PT(FileRecord) >::const_iterator i = _file_records.begin(); for(; i != _file_records.end(); ++i) { (*i)->output(out); } @@ -389,7 +389,7 @@ get_file_name(int index) const { //////////////////////////////////////////////////////////////////// bool DownloadDb::MultifileRecord:: file_exists(string fname) const { - vector::const_iterator i = _file_records.begin(); + vector< PT(FileRecord) >::const_iterator i = _file_records.begin(); for(; i != _file_records.end(); ++i) { if (fname == (*i)->_name) { return true; @@ -406,7 +406,7 @@ file_exists(string fname) const { //////////////////////////////////////////////////////////////////// PT(DownloadDb::FileRecord) DownloadDb::MultifileRecord:: get_file_record_named(string fname) const { - vector::const_iterator i = _file_records.begin(); + vector< PT(FileRecord) >::const_iterator i = _file_records.begin(); for(; i != _file_records.end(); ++i) { if (fname == (*i)->_name) { return (*i); @@ -458,7 +458,7 @@ Db(void) { //////////////////////////////////////////////////////////////////// void DownloadDb::Db:: output(ostream &out) const { - vector::const_iterator i = _mfile_records.begin(); + vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin(); for(; i != _mfile_records.end(); ++i) { (*i)->output(out); } @@ -492,7 +492,7 @@ get_multifile_name(int index) const { //////////////////////////////////////////////////////////////////// bool DownloadDb::Db:: multifile_exists(string mfname) const { - vector::const_iterator i = _mfile_records.begin(); + vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin(); for(; i != _mfile_records.end(); ++i) { if (mfname == (*i)->_name) { return true; @@ -508,7 +508,7 @@ multifile_exists(string mfname) const { //////////////////////////////////////////////////////////////////// PT(DownloadDb::MultifileRecord) DownloadDb::Db:: get_multifile_record_named(string mfname) const { - vector::const_iterator i = _mfile_records.begin(); + vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin(); for(; i != _mfile_records.end(); ++i) { if (mfname == (*i)->_name) { return (*i); @@ -756,7 +756,7 @@ write(ofstream &write_stream) { PN_int32 header_length; // Iterate over the multifiles writing them to the stream - vector::const_iterator i = _mfile_records.begin(); + vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin(); for(; i != _mfile_records.end(); ++i) { _datagram.clear(); @@ -795,7 +795,7 @@ write(ofstream &write_stream) { // Now iterate over this multifile's files writing them to the stream // Iterate over the multifiles writing them to the stream - vector::const_iterator j = (*i)->_file_records.begin(); + vector< PT(FileRecord) >::const_iterator j = (*i)->_file_records.begin(); for(; j != (*i)->_file_records.end(); ++j) { // Clear the datagram before we jam a bunch of stuff on it _datagram.clear(); diff --git a/panda/src/downloader/downloadDb.h b/panda/src/downloader/downloadDb.h index 8765d960e9..f5b4713dca 100644 --- a/panda/src/downloader/downloadDb.h +++ b/panda/src/downloader/downloadDb.h @@ -121,7 +121,7 @@ public: string _name; }; - typedef vector FileRecords; + typedef vector< PT(FileRecord) > FileRecords; class EXPCL_PANDAEXPRESS MultifileRecord : public ReferenceCount { public: @@ -141,7 +141,7 @@ public: FileRecords _file_records; }; - typedef vector MultifileRecords; + typedef vector< PT(MultifileRecord) > MultifileRecords; class EXPCL_PANDAEXPRESS Db { public: diff --git a/panda/src/effects/lensFlareNode.h b/panda/src/effects/lensFlareNode.h index a0bd0cc021..39150282e7 100644 --- a/panda/src/effects/lensFlareNode.h +++ b/panda/src/effects/lensFlareNode.h @@ -46,8 +46,8 @@ public: private: typedef vector vector_Vfloat; typedef vector vector_Vcolorf; - typedef vector vector_relation; - typedef vector vector_texture; + typedef vector< PT(RenderRelation) > vector_relation; + typedef vector< PT(Texture) > vector_texture; vector_texture _flares; PT(Texture) _blind; diff --git a/panda/src/egg/eggBinMaker.h b/panda/src/egg/eggBinMaker.h index 61ed1a3bf8..dd366eeab1 100644 --- a/panda/src/egg/eggBinMaker.h +++ b/panda/src/egg/eggBinMaker.h @@ -263,7 +263,7 @@ private: // Then we walk through that list and create a Bins/Nodes structure // for each group, which separates out the nodes into the individual // bins. - typedef vector Nodes; + typedef vector< PT(EggNode) > Nodes; typedef vector Bins; void collect_nodes(EggGroupNode *group); diff --git a/panda/src/egg/eggGroupNode.h b/panda/src/egg/eggGroupNode.h index 23e3458d81..77d5abe591 100644 --- a/panda/src/egg/eggGroupNode.h +++ b/panda/src/egg/eggGroupNode.h @@ -45,7 +45,7 @@ private: // We define the list of children as a list and not a vector, so we // can avoid the bad iterator-invalidating properties of vectors as // we insert/delete elements. - typedef list Children; + typedef list< PT(EggNode) > Children; // Here begins the actual public interface to EggGroupNode. diff --git a/panda/src/egg/eggNurbsSurface.h b/panda/src/egg/eggNurbsSurface.h index cbf11c956b..327e7d15e7 100644 --- a/panda/src/egg/eggNurbsSurface.h +++ b/panda/src/egg/eggNurbsSurface.h @@ -21,7 +21,7 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDAEGG EggNurbsSurface : public EggSurface { public: - typedef list Curves; + typedef list< PT(EggNurbsCurve) > Curves; typedef Curves Loop; typedef list Loops; typedef Loops Trim; diff --git a/panda/src/egg/eggTextureCollection.h b/panda/src/egg/eggTextureCollection.h index 8ffa02dabc..98831c299c 100644 --- a/panda/src/egg/eggTextureCollection.h +++ b/panda/src/egg/eggTextureCollection.h @@ -30,14 +30,14 @@ class EXPCL_PANDAEGG EggTextureCollection { private: typedef map Textures; - typedef vector OrderedTextures; + typedef vector< PT(EggTexture) > OrderedTextures; public: typedef OrderedTextures::const_iterator iterator; typedef iterator const_iterator; typedef OrderedTextures::size_type size_type; - typedef map TextureReplacement; + typedef map TextureReplacement; // Here begins the actual public interface to EggTextureCollection. diff --git a/panda/src/egg/eggUtilities.h b/panda/src/egg/eggUtilities.h index b7b32f43fa..c7d4e12f07 100644 --- a/panda/src/egg/eggUtilities.h +++ b/panda/src/egg/eggUtilities.h @@ -28,7 +28,7 @@ class EggNode; class EggVertex; -typedef set EggTextures; +typedef set< PT(EggTexture) > EggTextures; typedef map EggTextureFilenames; diff --git a/panda/src/egg/parser.yxx b/panda/src/egg/parser.yxx index f13756a41b..a58432f55f 100644 --- a/panda/src/egg/parser.yxx +++ b/panda/src/egg/parser.yxx @@ -48,7 +48,7 @@ // and push it onto the stack. At any given time, the top of the // stack is the EggObject we are currently scanning. -typedef vector EggStack; +typedef vector< PT(EggObject) > EggStack; static EggStack egg_stack; // There's one "top-level" egg node, which is where we should parent @@ -59,17 +59,17 @@ static EggGroupNode *egg_top_node; // We need a table mapping vertex pool names to vertex pools. -typedef map VertexPools; +typedef map VertexPools; static VertexPools vertex_pools; // And another one mapping texture names to textures. -typedef map Textures; +typedef map Textures; static Textures textures; // And again for material names to materials. -typedef map Materials; +typedef map Materials; static Materials materials; // We need to be able to save the index number requested for a vertex diff --git a/panda/src/express/tokenBoard.I b/panda/src/express/tokenBoard.I index 1afa4e9751..cb1570252b 100644 --- a/panda/src/express/tokenBoard.I +++ b/panda/src/express/tokenBoard.I @@ -31,7 +31,7 @@ is_done_token(int id) { } // Now we can search really_done for our desired id. - list::iterator found; + list< PT(TokenType) >::iterator found; found = find_if(_really_done.begin(), _really_done.end(), TokenMatch(id)); @@ -59,7 +59,7 @@ get_done_token(int id) { } // Now we can search really_done for our desired id. - list::iterator found; + list< PT(TokenType) >::iterator found; found = find_if(_really_done.begin(), _really_done.end(), TokenMatch(id)); diff --git a/panda/src/express/tokenBoard.h b/panda/src/express/tokenBoard.h index 480aa97e75..156650dfc6 100644 --- a/panda/src/express/tokenBoard.h +++ b/panda/src/express/tokenBoard.h @@ -58,7 +58,7 @@ public: // extracted into the local list so we can safely search for and // remove a particular token from the middle of the list (we can // only remove from the head of a circular buffer). - list _really_done; + list< PT(TokenType) > _really_done; }; #include "tokenBoard.I" diff --git a/panda/src/gobj/texturePool.h b/panda/src/gobj/texturePool.h index e49d67535f..d315252cc1 100644 --- a/panda/src/gobj/texturePool.h +++ b/panda/src/gobj/texturePool.h @@ -55,7 +55,7 @@ private: static TexturePool *get_ptr(); static TexturePool *_global_ptr; - typedef map Textures; + typedef map Textures; Textures _textures; }; diff --git a/panda/src/graph/nodeAttributes.h b/panda/src/graph/nodeAttributes.h index b46063f34f..94dd3b3f94 100644 --- a/panda/src/graph/nodeAttributes.h +++ b/panda/src/graph/nodeAttributes.h @@ -44,7 +44,7 @@ PUBLISHED: int compare_to(const NodeAttributes &other) const; private: - typedef map Attributes; + typedef map< TypeHandle, PT(NodeAttribute) > Attributes; public: // STL-like definitions to expose the map within NodeAttributes to // external adjustment. Beware! These are not safe to use outside diff --git a/panda/src/graph/nodeRelation.h b/panda/src/graph/nodeRelation.h index 6130504310..b18271b3e2 100644 --- a/panda/src/graph/nodeRelation.h +++ b/panda/src/graph/nodeRelation.h @@ -236,7 +236,7 @@ template INLINE bool get_transition_into(Transition *&ptr, const NodeRelation *arc); -typedef vector DownRelationPointers; +typedef vector< PT(NodeRelation) > DownRelationPointers; typedef map DownRelations; typedef vector UpRelationPointers; diff --git a/panda/src/graph/nodeTransitions.h b/panda/src/graph/nodeTransitions.h index 61d909fd9c..d6812b0126 100644 --- a/panda/src/graph/nodeTransitions.h +++ b/panda/src/graph/nodeTransitions.h @@ -49,7 +49,7 @@ public: void remove_all_from_arc(NodeRelation *arc); private: - typedef map Transitions; + typedef map Transitions; public: // STL-like definitions to allow read-only traversal of the diff --git a/panda/src/graph/setTransitionHelpers.I b/panda/src/graph/setTransitionHelpers.I index 5f580aad77..44016d1928 100644 --- a/panda/src/graph/setTransitionHelpers.I +++ b/panda/src/graph/setTransitionHelpers.I @@ -102,7 +102,7 @@ tmap_merge_union(InputIterator1 first1, InputIterator1 last1, ++result; } else { PT(NodeAttribute) c = (*first1).second->merge((*first2).second); - *result = pair((*first1).first, c); + *result = pair((*first1).first, c); ++first1; ++first2; ++result; @@ -194,7 +194,7 @@ tmap_arc_compose(InputIterator1 first1, InputIterator1 last1, PT(NodeTransition) c = (*first1).second->compose((*first2).second); if (c != (NodeTransition *)NULL) { c->added_to_arc(to_arc); - *result = pair((*first1).first, c); + *result = pair((*first1).first, c); ++result; } ++first1; @@ -334,7 +334,7 @@ tmap_invert_compose(InputIterator1 first1, InputIterator1 last1, (*first2).second); if (!ic.is_identity()) { // Only bother to store the result if it's not identity. - *result = pair((*first1).first, ic); + *result = pair((*first1).first, ic); ++result; } ++first1; @@ -721,13 +721,13 @@ tmap_apply(InputIterator1 first1, InputIterator1 last1, ++first1; ++result; } else if ((*first2).first < (*first1).first) { - *result = pair + *result = pair ((*first2).first, NodeTransitionCacheEntry::apply(NULL, (*first2).second)); ++first2; ++result; } else { - *result = pair + *result = pair ((*first1).first, NodeTransitionCacheEntry::apply((*first1).second, (*first2).second)); ++first1; @@ -743,7 +743,7 @@ tmap_apply(InputIterator1 first1, InputIterator1 last1, } while (first2 != last2) { - *result = pair + *result = pair ((*first2).first, NodeTransitionCacheEntry::apply(NULL, (*first2).second)); ++first2; diff --git a/panda/src/gui/guiCollection.h b/panda/src/gui/guiCollection.h index fd4f7d8ac6..786cc7eacb 100644 --- a/panda/src/gui/guiCollection.h +++ b/panda/src/gui/guiCollection.h @@ -12,7 +12,7 @@ class EXPCL_PANDA GuiCollection : public GuiItem { private: - typedef vector Items; + typedef vector< PT(GuiItem) > Items; Items _items; diff --git a/panda/src/lerp/lerpfunctor.h b/panda/src/lerp/lerpfunctor.h index c133a7a1ba..92f2fd44ce 100644 --- a/panda/src/lerp/lerpfunctor.h +++ b/panda/src/lerp/lerpfunctor.h @@ -182,7 +182,7 @@ typedef SimpleQueryLerpFunctor LVector4fQueryLerpFunctor; class EXPCL_PANDA MultiLerpFunctor : public LerpFunctor { private: - typedef set Functors; + typedef set< PT(LerpFunctor) > Functors; Functors _funcs; public: MultiLerpFunctor(void) {} diff --git a/panda/src/loader/modelPool.h b/panda/src/loader/modelPool.h index e897cf4843..e295e43aab 100644 --- a/panda/src/loader/modelPool.h +++ b/panda/src/loader/modelPool.h @@ -60,7 +60,7 @@ private: static ModelPool *get_ptr(); static ModelPool *_global_ptr; - typedef map Models; + typedef map Models; Models _models; }; diff --git a/panda/src/net/connectionManager.h b/panda/src/net/connectionManager.h index bfaa3c6ee2..6bef5c5a1f 100644 --- a/panda/src/net/connectionManager.h +++ b/panda/src/net/connectionManager.h @@ -61,7 +61,7 @@ protected: void add_writer(ConnectionWriter *writer); void remove_writer(ConnectionWriter *writer); - typedef set Connections; + typedef set< PT(Connection) > Connections; typedef set Readers; typedef set Writers; Connections _connections; diff --git a/panda/src/net/queuedConnectionManager.h b/panda/src/net/queuedConnectionManager.h index b70eb4e420..4b478f93cd 100644 --- a/panda/src/net/queuedConnectionManager.h +++ b/panda/src/net/queuedConnectionManager.h @@ -30,7 +30,7 @@ EXPORT_TEMPLATE_CLASS(EXPCL_PANDA, EXPTP_PANDA, QueuedReturn< PT(Connection) >); // resources. //////////////////////////////////////////////////////////////////// class EXPCL_PANDA QueuedConnectionManager : public ConnectionManager, - public QueuedReturn { + public QueuedReturn< PT(Connection) > { PUBLISHED: QueuedConnectionManager(); ~QueuedConnectionManager(); diff --git a/panda/src/net/test_spam_server.cxx b/panda/src/net/test_spam_server.cxx index 5ea8602d9d..fc48661f6e 100644 --- a/panda/src/net/test_spam_server.cxx +++ b/panda/src/net/test_spam_server.cxx @@ -44,7 +44,7 @@ main(int argc, char *argv[]) { QueuedConnectionListener listener(&cm, 1); listener.add_connection(rendezvous); - typedef set Clients; + typedef set< PT(Connection) > Clients; Clients clients; QueuedConnectionReader reader(&cm, 10); diff --git a/panda/src/net/test_tcp_server.cxx b/panda/src/net/test_tcp_server.cxx index 8f8dcb49dc..60bc573ed7 100644 --- a/panda/src/net/test_tcp_server.cxx +++ b/panda/src/net/test_tcp_server.cxx @@ -39,7 +39,7 @@ main(int argc, char *argv[]) { QueuedConnectionListener listener(&cm, 0); listener.add_connection(rendezvous); - typedef set Clients; + typedef set< PT(Connection) > Clients; Clients clients; QueuedConnectionReader reader(&cm, 1); diff --git a/panda/src/parametrics/parametricCurveCollection.h b/panda/src/parametrics/parametricCurveCollection.h index 13375e9853..a83b6a9a09 100644 --- a/panda/src/parametrics/parametricCurveCollection.h +++ b/panda/src/parametrics/parametricCurveCollection.h @@ -93,7 +93,7 @@ private: void redraw(); private: - typedef vector ParametricCurves; + typedef vector< PT(ParametricCurve) > ParametricCurves; ParametricCurves _curves; typedef list DrawerList; DrawerList _drawers; diff --git a/panda/src/parametrics/parametricCurveDrawer.h b/panda/src/parametrics/parametricCurveDrawer.h index 9c3114afb4..3eb738802c 100644 --- a/panda/src/parametrics/parametricCurveDrawer.h +++ b/panda/src/parametrics/parametricCurveDrawer.h @@ -71,7 +71,7 @@ private: float _num_ticks; float _tick_scale; - typedef vector TickArcs; + typedef vector< PT(NodeRelation) > TickArcs; TickArcs _tick_arcs; public: diff --git a/panda/src/particlesystem/particleSystem.cxx b/panda/src/particlesystem/particleSystem.cxx index 548f400cd6..77b56d7bea 100644 --- a/panda/src/particlesystem/particleSystem.cxx +++ b/panda/src/particlesystem/particleSystem.cxx @@ -541,8 +541,8 @@ public: }; // returns 0 if OK, # of errors if not OK -static int check_free_live_total_particles(vector live_counts, - vector dead_counts, vector total_counts, +static int check_free_live_total_particles(vector< PT(SC_valuenamepair) > live_counts, + vector< PT(SC_valuenamepair) > dead_counts, vector< PT(SC_valuenamepair) > total_counts, int print_all = 0) { int val = 0; @@ -650,9 +650,9 @@ sanity_check() { /////////////////////////////////////////////////////////////////// // check the numbers of free particles, live particles, and total particles - vector live_counts; - vector dead_counts; - vector total_counts; + vector< PT(SC_valuenamepair) > live_counts; + vector< PT(SC_valuenamepair) > dead_counts; + vector< PT(SC_valuenamepair) > total_counts; live_counts.push_back(new SC_valuenamepair(real_live_particle_count, "real_live_particle_count")); diff --git a/panda/src/putil/factoryBase.h b/panda/src/putil/factoryBase.h index 4b588e9e10..b3fc49397f 100644 --- a/panda/src/putil/factoryBase.h +++ b/panda/src/putil/factoryBase.h @@ -75,7 +75,8 @@ private: private: // internal mechanics and bookkeeping -#ifdef WIN32_VC + +#if defined(WIN32_VC) && !defined(__ICL) //__ICL is Intel C++ // Visual C++ seems to have a problem with building a map based on // BaseCreateFunc. We'll have to typecast it on the way out. typedef map Creators; diff --git a/panda/src/putil/factoryParams.h b/panda/src/putil/factoryParams.h index 36532cb2bd..5bc628221d 100644 --- a/panda/src/putil/factoryParams.h +++ b/panda/src/putil/factoryParams.h @@ -41,7 +41,7 @@ public: FactoryParam *get_param_of_type(TypeHandle type) const; private: - typedef vector Params; + typedef vector< PT(TypedReferenceCount) > Params; Params _params; }; diff --git a/panda/src/sgidisplay/sgiGraphicsPipe.h b/panda/src/sgidisplay/sgiGraphicsPipe.h index 31de8a1028..160ae5e1d3 100644 --- a/panda/src/sgidisplay/sgiGraphicsPipe.h +++ b/panda/src/sgidisplay/sgiGraphicsPipe.h @@ -35,7 +35,7 @@ public: protected: - typedef map Channels; + typedef map Channels; Channels _hw_chans; virtual int get_num_hw_channels(); diff --git a/panda/src/shader/shaderTransition.h b/panda/src/shader/shaderTransition.h index f3286dc73f..4250c0e509 100644 --- a/panda/src/shader/shaderTransition.h +++ b/panda/src/shader/shaderTransition.h @@ -28,8 +28,8 @@ //////////////////////////////////////////////////////////////////// class EXPCL_SHADER ShaderTransition : public ImmediateTransition { private: - // typedef vector Shaders; - typedef list Shaders; + // typedef vector< PT(Shader) > Shaders; + typedef list< PT(Shader) > Shaders; typedef map ShaderOrder; typedef map ShaderOverride; typedef set ShaderBlend; diff --git a/panda/src/testbed/deadrec_rec.cxx b/panda/src/testbed/deadrec_rec.cxx index d4298254d1..97d51e5535 100644 --- a/panda/src/testbed/deadrec_rec.cxx +++ b/panda/src/testbed/deadrec_rec.cxx @@ -26,7 +26,7 @@ Configure(deadrec); ConfigureFn(deadrec) { } -typedef set Clients; +typedef set< PT(Connection) > Clients; static PT_Node smiley; static RenderRelation* my_arc; diff --git a/panda/src/testbed/min_shader.cxx b/panda/src/testbed/min_shader.cxx index 282ff47f09..df4ad63147 100644 --- a/panda/src/testbed/min_shader.cxx +++ b/panda/src/testbed/min_shader.cxx @@ -178,7 +178,7 @@ public: virtual ~Viztex(void); virtual void Flush(void); protected: - typedef std::list winlist; + typedef std::list< PT(GraphicsWindow) > winlist; typedef winlist::iterator winiter; winlist _wins; diff --git a/panda/src/testbed/shader_test.cxx b/panda/src/testbed/shader_test.cxx index 0adf9b98a5..dc9160ca8c 100644 --- a/panda/src/testbed/shader_test.cxx +++ b/panda/src/testbed/shader_test.cxx @@ -151,7 +151,7 @@ public: virtual ~Viztex(void); virtual void Flush(void); protected: - typedef std::list winlist; + typedef std::list< PT(GraphicsWindow) > winlist; typedef winlist::iterator winiter; winlist _wins; diff --git a/panda/src/tform/dataValve.h b/panda/src/tform/dataValve.h index 1f22987e6a..003f7df020 100644 --- a/panda/src/tform/dataValve.h +++ b/panda/src/tform/dataValve.h @@ -81,7 +81,7 @@ private: ModifierButtons _mods; PT(Control) _default_control; - typedef map FineControls; + typedef map FineControls; class Child { public: diff --git a/panda/src/tform/mouseWatcher.h b/panda/src/tform/mouseWatcher.h index 9a3ca5d7fd..ee71129076 100644 --- a/panda/src/tform/mouseWatcher.h +++ b/panda/src/tform/mouseWatcher.h @@ -87,7 +87,7 @@ private: const MouseWatcherRegion *region, const string &button_name = string()); - typedef set Regions; + typedef set< PT(MouseWatcherRegion) > Regions; Regions _regions; bool _has_mouse;