pvector, pmap, etc.

direct/src/dcparser/dcAtomicField.h

@@ -23,8 +23,6 @@
 #include "dcField.h"
 #include "dcSubatomicType.h"
 
-#include <vector>
-
 ////////////////////////////////////////////////////////////////////
 //       Class : DCAtomicField
 // Description : A single atomic field of a Distributed Class, as read
@@ -81,7 +79,7 @@ public:
     bool format_default_value(const string &str, string &formatted) const;
   };
 
-  typedef vector<ElementType> Elements;
+  typedef pvector<ElementType> Elements;
   Elements _elements;
 
   enum Flags {

direct/src/dcparser/dcClass.h

@@ -22,9 +22,6 @@
 #include "dcbase.h"
 #include "dcField.h"
 
-#include <vector>
-#include <map>
-
 class HashGenerator;
 
 ////////////////////////////////////////////////////////////////////
@@ -62,16 +59,16 @@ public:
   int _number;
   string _name;
 
-  typedef vector<DCClass *> Parents;
+  typedef pvector<DCClass *> Parents;
   Parents _parents;
 
-  typedef vector<DCField *> Fields;
+  typedef pvector<DCField *> Fields;
   Fields _fields;
 
 public:
   // These members are built up during parsing for the convenience of
   // the parser.
-  typedef map<string, DCField *> FieldsByName;
+  typedef pmap<string, DCField *> FieldsByName;
   FieldsByName _fields_by_name;
 };
 

direct/src/dcparser/dcFile.h

@@ -22,9 +22,6 @@
 #include "dcbase.h"
 #include "dcClass.h"
 
-#include <vector>
-#include <map>
-
 class HashGenerator;
 
 ////////////////////////////////////////////////////////////////////
@@ -57,12 +54,12 @@ public:
 public:
   // This vector is the primary interface to the distributed classes
   // read from the file.
-  typedef vector<DCClass *> Classes;
+  typedef pvector<DCClass *> Classes;
   Classes _classes;
 
 public:
   // This map is built up during parsing for the convenience of the parser.
-  typedef map<string, DCClass *> ClassesByName;
+  typedef pmap<string, DCClass *> ClassesByName;
   ClassesByName _classes_by_name;
 };
 

direct/src/dcparser/dcMolecularField.h

@@ -22,8 +22,6 @@
 #include "dcbase.h"
 #include "dcField.h"
 
-#include <vector>
-
 class DCAtomicField;
 
 ////////////////////////////////////////////////////////////////////
@@ -48,7 +46,7 @@ public:
 public:
   // These members define the primary interface to the molecular field
   // definition as read from the file.
-  typedef vector<DCAtomicField *> Fields;
+  typedef pvector<DCAtomicField *> Fields;
   Fields _fields;
 };
 

direct/src/dcparser/dcbase.h

@@ -34,6 +34,8 @@
 #include <notify.h>
 #include <filename.h>
 #include <numeric_types.h>
+#include "pvector.h"
+#include "pmap.h"
 
 #else
 
@@ -98,6 +100,10 @@ typedef string Filename;
 #define IS_LITTLE_ENDIAN
 #endif
 
+#include <vector>
+#include <map>
+#define pvector vector
+#define pmap map
 
 #endif  // WITHIN_PANDA
 

direct/src/dcparser/primeNumberGenerator.h

@@ -36,7 +36,7 @@ public:
   int operator [] (int n);
 
 private:
-  typedef vector<int> Primes;
+  typedef pvector<int> Primes;
   Primes _primes;
 };
 

dtool/src/dtoolbase/pmap.h

@@ -35,7 +35,8 @@ template<class Key, class Value, class Compare = less<Key> >
 class pmap : public map<Key, Value, Compare, pallocator<pair<Key, Value> > > {
 public:
   pmap() : map<Key, Value, Compare, pallocator<pair<Key, Value> > >() { }
-  pmap(const pmap<Key> &copy) : map<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
+  pmap(const pmap<Key, Value, Compare> &copy) : map<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
+  pmap(const Compare &comp) : map<Key, Compare, pallocator<Key> >(comp) { }
 };
 
 ////////////////////////////////////////////////////////////////////
@@ -49,7 +50,8 @@ template<class Key, class Value, class Compare = less<Key> >
 class pmultimap : public multimap<Key, Value, Compare, pallocator<pair<Key, Value> > > {
 public:
   pmultimap() : multimap<Key, Value, Compare, pallocator<pair<Key, Value> > >() { }
-  pmultimap(const pmultimap<Key> &copy) : multimap<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
+  pmultimap(const pmultimap<Key, Value, Compare> &copy) : multimap<Key, Value, Compare, pallocator<pair<Key, Value> > >(copy) { }
+  pmultimap(const Compare &comp) : multimap<Key, Compare, pallocator<Key> >(comp) { }
 };
 
 #endif

dtool/src/dtoolbase/pset.h

@@ -35,7 +35,8 @@ template<class Key, class Compare = less<Key> >
 class pset : public set<Key, Compare, pallocator<Key> > {
 public:
   pset() : set<Key, Compare, pallocator<Key> >() { }
-  pset(const pset<Key> &copy) : set<Key, Compare, pallocator<Key> >(copy) { }
+  pset(const pset<Key, Compare> &copy) : set<Key, Compare, pallocator<Key> >(copy) { }
+  pset(const Compare &comp) : set<Key, Compare, pallocator<Key> >(comp) { }
 };
 
 ////////////////////////////////////////////////////////////////////
@@ -49,7 +50,8 @@ template<class Key, class Compare = less<Key> >
 class pmultiset : public multiset<Key, Compare, pallocator<Key> > {
 public:
   pmultiset() : multiset<Key, Compare, pallocator<Key> >() { }
-  pmultiset(const pmultiset<Key> &copy) : multiset<Key, Compare, pallocator<Key> >(copy) { }
+  pmultiset(const pmultiset<Key, Compare> &copy) : multiset<Key, Compare, pallocator<Key> >(copy) { }
+  pmultiset(const Compare &comp) : multiset<Key, Compare, pallocator<Key> >(comp) { }
 };
 
 #endif

dtool/src/dtoolbase/pvector.h

@@ -38,6 +38,7 @@ public:
   pvector(const pvector<Type> &copy) : vector<Type, pallocator<Type> >(copy) { }
   pvector(size_type n) : vector<Type, pallocator<Type> >(n) { }
   pvector(size_type n, const Type &value) : vector<Type, pallocator<Type> >(n, value) { }
+  pvector(const Type *begin, const Type *end) : vector<Type, pallocator<Type> >(begin, end) { }
 };
 
 #endif

dtool/src/parser-inc/Sources.pp

@@ -1,5 +1,5 @@
 #define INSTALL_PARSER_INC \
     algorithm deque iostream list map memory \
-    pair queue set stack stdtypedefs.h \
+    pair queue set stack stdcompare.h stdtypedefs.h \
     string vector windows.h zlib.h md5.h files.h hex.h \
     nurbs.hh

dtool/src/parser-inc/map

@@ -25,11 +25,10 @@
 #define MAP_H
 
 #include <stdtypedefs.h>
+#include <stdcompare.h>
 #include <pair>
 
-class default_map_compare;
-
-template<class key, class element, class compare = default_map_compare>
+template<class key, class element, class compare = less<key> >
 class map {
 public:
   typedef key key_type;
@@ -51,7 +50,7 @@ public:
   class difference_type;
 };
 
-template<class key, class element, class compare = default_map_compare>
+template<class key, class element, class compare = less<key> >
 class multimap : public map<key, element, compare> {
 };
 

dtool/src/parser-inc/set

@@ -25,10 +25,9 @@
 #define SET_H
 
 #include <stdtypedefs.h>
+#include <stdcompare.h>
 
-class default_set_compare;
-
-template<class key, class compare = default_set_compare>
+template<class key, class compare = less<key> >
 class set {
 public:
   typedef key key_type;
@@ -49,7 +48,7 @@ public:
   class difference_type;
 };
 
-template<class key, class compare = default_set_compare>
+template<class key, class compare = less<key> >
 class multiset : public set<key, compare> {
 };
 

dtool/src/parser-inc/stdcompare.h

@@ -0,0 +1,33 @@
+// Filename: stdcompare.h
+// Created by:  drose (05Jun01)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
+// This file, and all the other files in this directory, aren't
+// intended to be compiled--they're just parsed by CPPParser (and
+// interrogate) in lieu of the actual system headers, to generate the
+// interrogate database.
+
+#ifndef STDCOMPARE_H
+#define STDCOMPARE_H
+
+template<class key>
+class less {
+public:
+};
+
+#endif
+

panda/src/audio/audio_linux_traits.cxx

@@ -24,12 +24,12 @@
 #include "config_audio.h"
 #include <ipc_thread.h>
 #include <ipc_mutex.h>
-#include <set>
+#include "pset.h"
 #include <fcntl.h>
 #include <sys/soundcard.h>
 #include <sys/ioctl.h>
 
-typedef set<Buffer*> BufferSet;
+typedef pset<Buffer*> BufferSet;
 
 static bool have_initialized = false;
 static mutex buffer_mutex;

panda/src/audio/audio_manager.h

@@ -25,7 +25,7 @@
 
 #include <ipc_mutex.h>
 #include <ipc_thread.h>
-#include <set>
+#include "pset.h"
 
 class EXPCL_PANDA AudioManager {
 private:
@@ -46,7 +46,7 @@ private:
 
   typedef void UpdateFunc(void);
   typedef void ShutdownFunc(void);
-  typedef set<AudioSound*> LoopSet;
+  typedef pset<AudioSound*> LoopSet;
   static AudioManager* _global_ptr;
   static UpdateFunc* _update_func;
   static ShutdownFunc* _shutdown_func;

panda/src/audio/audio_midi.h

@@ -20,12 +20,12 @@
 #define __AUDIO_MIDI_H__
 
 #include <filename.h>
-#include <list>
+#include "plist.h"
 
 // define an internal representation for a midi file
 class AudioMidi {
 private:
-  typedef list<string> StrList;
+  typedef plist<string> StrList;
   StrList _seq;
 public:
   AudioMidi(Filename, int = 1);

panda/src/audio/audio_mikmod_traits.cxx

@@ -22,7 +22,7 @@
 
 #include "audio_manager.h"
 #include "config_audio.h"
-#include <list>
+#include "plist.h"
 #include <serialization.h>
 
 static bool have_initialized = false;
@@ -43,7 +43,7 @@ static void initialize(void) {
   md_mixfreq = audio_mix_freq;
   {
     // I think this is defined elsewhere
-    typedef list<string> StrList;
+    typedef plist<string> StrList;
     typedef Serialize::Deserializer<StrList> OptBuster;
     StrList opts;
     OptBuster buster(*audio_mode_flags, " ");

panda/src/audio/audio_pool.cxx

@@ -21,7 +21,7 @@
 #include <config_util.h>
 
 AudioPool* AudioPool::_global_ptr = (AudioPool*)0L;
-typedef map<string, AudioPool::SoundLoadFunc*> SoundLoaders;
+typedef pmap<string, AudioPool::SoundLoadFunc*> SoundLoaders;
 SoundLoaders* _sound_loaders = (SoundLoaders*)0L;
 
 ////////////////////////////////////////////////////////////////////

panda/src/audio/audio_pool.h

@@ -22,7 +22,7 @@
 #include "audio_sound.h"
 #include "audio_trait.h"
 #include "config_audio.h"
-#include <map>
+#include "pmap.h"
 #include <pandabase.h>
 #include <filename.h>
 #include <pointerTo.h>
@@ -40,7 +40,7 @@ private:
   static AudioPool* get_ptr(void);
 
   static AudioPool *_global_ptr;
-  typedef map<string, PT(AudioTraits::SoundClass) > SoundMap;
+  typedef pmap<string, PT(AudioTraits::SoundClass) > SoundMap;
   SoundMap _sounds;
 public:
   typedef AudioTraits::SoundClass* SoundLoadFunc(Filename);

panda/src/audiotraits/audio_load_mp3.cxx

@@ -146,8 +146,8 @@ static void initialize(void) {
 
 class BufferStuff {
 private:
-  typedef vector<unsigned char> Buffer;
-  typedef vector<Buffer> Buffers;
+  typedef pvector<unsigned char> Buffer;
+  typedef pvector<Buffer> Buffers;
   Buffers _bufs;
 public:
   BufferStuff(void) {}

panda/src/builder/builder.cxx

@@ -29,7 +29,7 @@
 #include <notify.h>
 #include <namedNode.h>
 #include <geomNode.h>
-#include <map>
+#include "pmap.h"
 #endif
 
 #include "builder.h"
@@ -126,7 +126,7 @@ public:
 ////////////////////////////////////////////////////////////////////
 GeomNode *Builder::
 build(const string &default_name) {
-  typedef map<NodeMap, GeomNode *, less<NodeMap> > GeomNodeMap;
+  typedef pmap<NodeMap, GeomNode *, less<NodeMap> > GeomNodeMap;
   GeomNodeMap geom_nodes;
 
   // First, build all the Geoms and create GeomNodes for them.  Each

panda/src/builder/builder.h

@@ -172,7 +172,7 @@
 
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 
 class GeomNode;
@@ -200,7 +200,7 @@ public:
 protected:
   void add_bucket(const BuilderBucket &bucket);
 
-  typedef set<BuilderBucketNode, less<BuilderBucketNode> > Buckets;
+  typedef pset<BuilderBucketNode, less<BuilderBucketNode> > Buckets;
 
   Buckets _buckets;
   Buckets::iterator _bi;

panda/src/builder/builderAttribTempl.h

@@ -22,7 +22,7 @@
 
 #include "builderTypes.h"
 
-#include <vector>
+#include "pvector.h"
 
 
 ////////////////////////////////////////////////////////////////////

panda/src/builder/builderBucketNode.h

@@ -24,7 +24,7 @@
 #include "builderPrim.h"
 #include "builderBucket.h"
 
-#include <set>
+#include "pset.h"
 
 class GeomNode;
 
@@ -59,8 +59,8 @@ public:
   int build(GeomNode *geom_node) const;
 
 protected:
-  typedef multiset<BuilderPrim, less<BuilderPrim> > Prims;
-  typedef multiset<BuilderPrimI, less<BuilderPrimI> > IPrims;
+  typedef pmultiset<BuilderPrim, less<BuilderPrim> > Prims;
+  typedef pmultiset<BuilderPrimI, less<BuilderPrimI> > IPrims;
 
   BuilderBucket *_bucket;
   Prims _prims;

panda/src/builder/builderFuncs.I

@@ -46,7 +46,7 @@ decomp_concave(const PrimType &prim, BuilderBucket &bucket,
                int asum, int x, int y) {
 #define VX(p, c)    p->coord[c]
 
-  vector<PrimType> output_prims;
+  pvector<PrimType> output_prims;
 
   DecompVtx *p0, *p1, *p2, *t0, *vert;
   DecompVtx *m[3];
@@ -804,7 +804,7 @@ __mesh_and_build(InputIterator first, InputIterator last,
     return 0;
   }
 
-  typedef vector<PrimType> Prims;
+  typedef pvector<PrimType> Prims;
   Prims prims;
   BuilderBucket *local_bucket = NULL;
   BuilderBucket *bucket_ptr = &bucket;

panda/src/builder/builderFuncs.h

@@ -20,7 +20,7 @@
 
 #include <pandabase.h>
 
-#include <vector>
+#include "pvector.h"
 
 #include <string>
 

panda/src/builder/builderNormalVisualizer.h

@@ -30,7 +30,7 @@
 #include "builderVertex.h"
 #include "builderPrim.h"
 
-#include <vector>
+#include "pvector.h"
 
 ///////////////////////////////////////////////////////////////////
 //       Class : BuilderNormalVisualizer
@@ -56,7 +56,7 @@ private:
 
   BuilderV _net_vertex;
   int _num_vertices;
-  vector<BuilderPrim> _lines;
+  pvector<BuilderPrim> _lines;
 };
 
 #include "builderNormalVisualizer.I"

panda/src/builder/builderPrimTempl.h

@@ -25,7 +25,7 @@
 #include "builderAttrib.h"
 #include "builderTypes.h"
 
-#include <vector>
+#include "pvector.h"
 
 
 /////////////////////////////////////////////////////////////////////
@@ -135,8 +135,8 @@ protected:
   INLINE int sort_value() const;
   void update_overall_attrib();
 
-  typedef vector<Vertex> Verts;
-  typedef vector<DAttrib> Components;
+  typedef pvector<Vertex> Verts;
+  typedef pvector<DAttrib> Components;
 
   Verts _verts;
   Components _components;

panda/src/builder/builderVertexTempl.h

@@ -24,7 +24,7 @@
 #include "builderTypes.h"
 #include "builderAttribTempl.h"
 
-#include <vector>
+#include "pvector.h"
 
 
 /////////////////////////////////////////////////////////////////////

panda/src/builder/builder_headers.h

@@ -18,9 +18,9 @@
 
 #include <geom.h>
 #include <geomNode.h>
-#include <list>
+#include "plist.h"
 #include <luse.h>
-#include <map>
+#include "pmap.h"
 #include <math.h>
 #include <namedNode.h>
 #include <notify.h>
@@ -29,9 +29,9 @@
 #include <pta_Normalf.h>
 #include <pta_TexCoordf.h>
 #include <pta_Vertexf.h>
-#include <set>
+#include "pset.h"
 #include <stdlib.h>
-#include <vector>
+#include "pvector.h"
 
 #include "builderAttrib.h"
 #include "builderAttribTempl.h"

panda/src/builder/mesherEdge.h

@@ -24,7 +24,7 @@
 #include "mesherConfig.h"
 #include "builderBucket.h"
 
-#include <list>
+#include "plist.h"
 #include <math.h>
 
 
@@ -61,7 +61,7 @@ public:
 
   const Vertex *_a, *_b;
 
-  typedef list<Strip *> Strips;
+  typedef plist<Strip *> Strips;
   Strips _strips;
   MesherEdge *_opposite;
 };

panda/src/builder/mesherFanMaker.I

@@ -304,12 +304,12 @@ unroll(Strips::iterator strip_begin, Strips::iterator strip_end,
 
   } else {
     // Now decompose the new polygon into triangles.
-    vector<Prim> tris;
+    pvector<Prim> tris;
     result = expand(poly, *_bucket, back_inserter(tris));
 
     if (result) {
       // Now add each triangle back into the mesher.
-      vector<Prim>::iterator ti;
+      pvector<Prim>::iterator ti;
 
       for (ti = tris.begin(); ti != tris.end(); ++ti) {
         _mesher->add_prim(*ti);

panda/src/builder/mesherFanMaker.h

@@ -30,7 +30,7 @@
 #include "mesherEdge.h"
 #include "mesherStrip.h"
 
-#include <list>
+#include "plist.h"
 
 
 template <class PrimType>
@@ -46,8 +46,8 @@ public:
   typedef MesherStrip<PrimType> Strip;
   typedef MesherTempl<PrimType> Mesher;
 
-  typedef list<const Edge *> Edges;
-  typedef list<Strip *> Strips;
+  typedef plist<const Edge *> Edges;
+  typedef plist<Strip *> Strips;
 
   MesherFanMaker() {}
   MesherFanMaker(const Vertex *vertex, Strip *tri, Mesher *mesher);

panda/src/builder/mesherStrip.I

@@ -466,7 +466,7 @@ cut_sheet(int first_row_id, int do_mate, const BuilderBucket &bucket) {
   // calling cut_sheet() recursively will start things mating, and
   // could damage our edge list.
 
-  typedef list<MesherStrip *> StripPtrs;
+  typedef plist<MesherStrip *> StripPtrs;
   StripPtrs strip_ptrs;
 
   for (ei = _edges.begin(); ei != _edges.end(); ++ei) {

panda/src/builder/mesherStrip.h

@@ -25,7 +25,7 @@
 #include "builderTypes.h"
 #include "builderBucket.h"
 
-#include <list>
+#include "plist.h"
 #include <math.h>
 
 
@@ -118,9 +118,9 @@ public:
 
   ostream &output(ostream &out) const;
 
-  typedef list<SAttrib> Prims;
-  typedef list<Edge *> Edges;
-  typedef list<const Vertex *> Verts;
+  typedef plist<SAttrib> Prims;
+  typedef plist<Edge *> Edges;
+  typedef plist<const Vertex *> Verts;
 
   Prims _prims;
   Edges _edges;

panda/src/builder/mesherTempl.I

@@ -384,7 +384,7 @@ count_vert_edges(const EdgePtrs &edges) const {
 }
 
 template <class PrimType>
-list<MesherTempl<PrimType>::Strip> &MesherTempl<PrimType>::
+plist<MesherTempl<PrimType>::Strip> &MesherTempl<PrimType>::
 choose_strip_list(const Strip &strip) {
   switch (strip._status) {
   case MS_done:
@@ -513,7 +513,7 @@ find_fans() {
       const Vertex &v = (*vi).first;
 
       // Build up a list of far fan edges.
-      typedef vector<FanMaker> FanMakers;
+      typedef pvector<FanMaker> FanMakers;
 
       FanMakers fans;
 
@@ -588,7 +588,7 @@ make_quads() {
 
   typedef pair<Strip *, Strip *> Pair;
   typedef pair<Pair, Edge *> Matched;
-  typedef vector<Matched> SoulMates;
+  typedef pvector<Matched> SoulMates;
 
   SoulMates soulmates;
 

panda/src/builder/mesherTempl.h

@@ -25,10 +25,10 @@
 #include "mesherEdge.h"
 #include "mesherStrip.h"
 
-#include <vector>
-#include <list>
-#include <set>
-#include <map>
+#include "pvector.h"
+#include "plist.h"
+#include "pset.h"
+#include "pmap.h"
 
 template <class PrimType>
 class MesherFanMaker;
@@ -54,18 +54,18 @@ public:
   void show(ostream &out);
 
 protected:
-  typedef list<Strip> Strips;
-  typedef set<Edge, less<Edge> > Edges;
-  typedef set<Edge *, less<Edge *> > EdgePtrs;
-  typedef map<Vertex, EdgePtrs, less<Vertex> > Verts;
+  typedef plist<Strip> Strips;
+  typedef pset<Edge, less<Edge> > Edges;
+  typedef pset<Edge *, less<Edge *> > EdgePtrs;
+  typedef pmap<Vertex, EdgePtrs, less<Vertex> > Verts;
 
   // This is used for show-tstrips.
-  typedef vector<BuilderC> Colors;
+  typedef pvector<BuilderC> Colors;
   // And this is used for show-qsheets.
-  typedef map<int, int, less<int> > ColorSheetMap;
+  typedef pmap<int, int, less<int> > ColorSheetMap;
 
   int count_vert_edges(const EdgePtrs &edges) const;
-  list<Strip> &choose_strip_list(const Strip &strip);
+  plist<Strip> &choose_strip_list(const Strip &strip);
 
   void build_sheets();
   void find_fans();

panda/src/chan/animChannelScalarTable.cxx

@@ -165,13 +165,13 @@ write_datagram(BamWriter *manager, Datagram &me)
     static const int max_values = 16;
     static const float scale = 1000.0;
 
-    map<int, int> index;
+    pmap<int, int> index;
     int i;
     for (i = 0;
          i < (int)_table.size() && (int)index.size() <= max_values;
          i++) {
       int value = (int)floor(_table[i] * scale + 0.5);
-      index.insert(map<int, int>::value_type(value, index.size()));
+      index.insert(pmap<int, int>::value_type(value, index.size()));
     }
     int index_length = index.size();
     if (index_length <= max_values) {
@@ -184,7 +184,7 @@ write_datagram(BamWriter *manager, Datagram &me)
         // We need to write the index in order by its index number; for
         // this, we need to invert the index.
         vector_float reverse_index(index_length);
-        map<int, int>::iterator mi;
+        pmap<int, int>::iterator mi;
         for (mi = index.begin(); mi != index.end(); ++mi) {
           float f = (float)(*mi).first / scale;
           int i = (*mi).second;

panda/src/chan/animControl.h

@@ -31,7 +31,7 @@
 #include <pt_Event.h>
 
 #include <string>
-#include <map>
+#include "pmap.h"
 
 class PartBundle;
 class AnimChannelBase;
@@ -108,7 +108,7 @@ public:
   };
 
 private:
-  typedef multimap<int, Action> Actions;
+  typedef pmultimap<int, Action> Actions;
 
   static void insert_event_action(Actions &actions, int frame, const CPT_Event &event);
   static void insert_stop_action(Actions &actions, int frame);

panda/src/chan/animControlCollection.h

@@ -27,7 +27,7 @@
 #include <pt_Event.h>
 
 #include <string>
-#include <map>
+#include "pmap.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : AnimControlCollection
@@ -85,7 +85,7 @@ PUBLISHED:
   string which_anim_playing() const;
 
 private:
-  typedef map<string,  PT(AnimControl) > Controls;
+  typedef pmap<string,  PT(AnimControl) > Controls;
   Controls _controls;
   CPT_Event _stop_event;
   AnimControl *_last_started_control;

panda/src/chan/animGroup.h

@@ -62,7 +62,7 @@ protected:
   void write_descendants(ostream &out, int indent_level) const;
 
 protected:
-  typedef vector< PT(AnimGroup) > Children;
+  typedef pvector< PT(AnimGroup) > Children;
   Children _children;
   AnimBundle *_root;
 

panda/src/chan/auto_bind.cxx

@@ -37,11 +37,11 @@
 #include <nullTransitionWrapper.h>
 #include "auto_bind.h"
 
-typedef set<AnimBundleNode *> AnimNodes;
-typedef map<string, AnimNodes> Anims;
+typedef pset<AnimBundleNode *> AnimNodes;
+typedef pmap<string, AnimNodes> Anims;
 
-typedef set<PartBundleNode *> PartNodes;
-typedef map<string, PartNodes> Parts;
+typedef pset<PartBundleNode *> PartNodes;
+typedef pmap<string, PartNodes> Parts;
 
 
 

panda/src/chan/movingPartBase.cxx

@@ -155,10 +155,10 @@ update_internals(PartGroup *, bool, bool) {
 //               infinity.
 ////////////////////////////////////////////////////////////////////
 void MovingPartBase::
-pick_channel_index(list<int> &holes, int &next) const {
+pick_channel_index(plist<int> &holes, int &next) const {
   // Verify each of the holes.
 
-  list<int>::iterator ii, ii_next;
+  plist<int>::iterator ii, ii_next;
   ii = holes.begin();
   while (ii != holes.end()) {
     ii_next = ii;

panda/src/chan/movingPartBase.h

@@ -58,10 +58,10 @@ public:
 protected:
   MovingPartBase(void);
 
-  virtual void pick_channel_index(list<int> &holes, int &next) const;
+  virtual void pick_channel_index(plist<int> &holes, int &next) const;
   virtual void bind_hierarchy(AnimGroup *anim, int channel_index);
 
-  typedef vector< PT(AnimChannelBase) > Channels;
+  typedef pvector< PT(AnimChannelBase) > Channels;
   Channels _channels;
 
 public:

panda/src/chan/partBundle.cxx

@@ -284,7 +284,7 @@ bind_anim(AnimBundle *anim, int hierarchy_match_flags) {
     return NULL;
   }
 
-  list<int> holes;
+  plist<int> holes;
   int channel_index = 0;
   pick_channel_index(holes, channel_index);
 

panda/src/chan/partBundle.h

@@ -42,7 +42,7 @@ public:
 
   // This is passed down through the MovingParts during the
   // do_update() call to specify the channels that are in effect.
-  typedef map<PT(AnimControl), float> ChannelBlend;
+  typedef pmap<PT(AnimControl), float> ChannelBlend;
 
   // This is the parameter to set_blend_type() and specifies the kind
   // of blending operation to be performed when multiple controls are

panda/src/chan/partGroup.cxx

@@ -411,7 +411,7 @@ write_descendants_with_value(ostream &out, int indent_level) const {
 //               infinity.
 ////////////////////////////////////////////////////////////////////
 void PartGroup::
-pick_channel_index(list<int> &holes, int &next) const {
+pick_channel_index(plist<int> &holes, int &next) const {
   Children::const_iterator ci;
   for (ci = _children.begin(); ci != _children.end(); ++ci) {
     (*ci)->pick_channel_index(holes, next);

panda/src/chan/partGroup.h

@@ -26,7 +26,7 @@
 #include <namable.h>
 #include <typedef.h>
 
-#include <list>
+#include "plist.h"
 
 class AnimControl;
 class AnimGroup;
@@ -89,10 +89,10 @@ protected:
   void write_descendants(ostream &out, int indent_level) const;
   void write_descendants_with_value(ostream &out, int indent_level) const;
 
-  virtual void pick_channel_index(list<int> &holes, int &next) const;
+  virtual void pick_channel_index(plist<int> &holes, int &next) const;
   virtual void bind_hierarchy(AnimGroup *anim, int channel_index);
 
-  typedef vector< PT(PartGroup) > Children;
+  typedef pvector< PT(PartGroup) > Children;
   Children _children;
 
 public:

panda/src/chan/vector_PartGroupStar.h

@@ -23,7 +23,7 @@
 
 #include "partGroup.h"
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : vector_PartGroupStar

panda/src/chancfg/chancfg.cxx

@@ -130,7 +130,7 @@ INLINE bool ConfigDefined(std::string sym) {
     (WindowDB->find(sym) != WindowDB->end());
 }
 
-typedef std::vector<SetupItem> SVec;
+typedef std::pvector<SetupItem> SVec;
 
 bool ChanCheckLayouts(SetupSyms& S) {
   if (S.empty())

panda/src/chancfg/chancfg.h

@@ -29,7 +29,7 @@
 #include <graphicsPipe.h>
 #include <graphicsWindow.h>
 
-#include <map>
+#include "pmap.h"
 
 class Node;
 
@@ -72,7 +72,7 @@ private:
     INLINE void setString(const std::string& v) { _str = v; }
     INLINE std::string getString(void) const { return _str; }
   };
-  typedef std::map<Field, Types> Fields;
+  typedef std::pmap<Field, Types> Fields;
   Fields _fields;
 public:
   ChanCfgOverrides(void);

panda/src/chancfg/chanlayout.cxx

@@ -44,7 +44,7 @@ LayoutParseFunctor::~LayoutParseFunctor(void) {
   return;
 }
 
-typedef std::vector<bool> LayoutBoolVec;
+typedef std::pvector<bool> LayoutBoolVec;
 
 void LayoutParseFunctor::operator()(std::string S) {
   std::string sym;

panda/src/chancfg/chanlayout.h

@@ -21,14 +21,14 @@
 
 #include <pandabase.h>
 
-#include <map>
-#include <vector>
+#include "pmap.h"
+#include "pvector.h"
 #include <algorithm>
 #include <string>
 #include "chanviewport.h"
 
 
-typedef std::vector<ChanViewport> LayoutRegionVec;
+typedef std::pvector<ChanViewport> LayoutRegionVec;
 
 class LayoutItem {
 private:
@@ -46,7 +46,7 @@ public:
   INLINE const ChanViewport& operator[](int);
 };
 
-typedef std::map<std::string, LayoutItem> LayoutType;
+typedef std::pmap<std::string, LayoutItem> LayoutType;
 
 extern LayoutType* LayoutDB;
 

panda/src/chancfg/chansetup.h

@@ -23,7 +23,7 @@
 
 #include <vector_string.h>
 
-#include <map>
+#include "pmap.h"
 #include "chanviewport.h"
 
 typedef vector_string SetupSyms;
@@ -88,7 +88,7 @@ public:
   INLINE Orientation getOrientation(void) const;
 };
 
-typedef std::map<std::string, SetupItem> SetupType;
+typedef std::pmap<std::string, SetupItem> SetupType;
 
 extern SetupType* SetupDB;
 

panda/src/chancfg/chanwindow.h

@@ -21,8 +21,8 @@
 
 #include <pandabase.h>
 
-#include <map>
-#include <vector>
+#include "pmap.h"
+#include "pvector.h"
 #include <string>
 #include "chansetup.h"
 
@@ -53,7 +53,7 @@ public:
   INLINE SetupSyms getSetups(void) const;
 };
 
-typedef std::map<std::string, WindowItem> WindowType;
+typedef std::pmap<std::string, WindowItem> WindowType;
 
 extern WindowType* WindowDB;
 

panda/src/char/character.h

@@ -68,7 +68,7 @@ PUBLISHED:
 private:
   void copy_joints(PartGroup *copy, PartGroup *orig);
 
-  typedef map<NodeRelation *, NodeRelation *> ArcMap;
+  typedef pmap<NodeRelation *, NodeRelation *> ArcMap;
   virtual Node *r_copy_subgraph(TypeHandle graph_type,
                                 InstanceMap &inst_map) const;
   void r_copy_char(Node *dest, const Node *source, TypeHandle graph_type,

panda/src/char/characterJoint.h

@@ -58,7 +58,7 @@ PUBLISHED:
   void clear_local_transforms();
 
 private:
-  typedef set< PT_NodeRelation > ArcList;
+  typedef pset< PT_NodeRelation > ArcList;
   ArcList _net_transform_arcs;
   ArcList _local_transform_arcs;
 

panda/src/char/computedVertices.cxx

@@ -63,9 +63,9 @@ VertexTransform(const VertexTransform &copy) :
 ////////////////////////////////////////////////////////////////////
 template<class ValueType, class MorphType>
 static void
-compute_morphs(ValueType *table, const vector<MorphType> &morph_list,
+compute_morphs(ValueType *table, const pvector<MorphType> &morph_list,
            Character *character) {
-  vector<MorphType>::const_iterator mli;
+  pvector<MorphType>::const_iterator mli;
   for (mli = morph_list.begin(); mli != morph_list.end(); ++mli) {
     const MorphType &morph = (*mli);
     const CharacterSlider *slider;

panda/src/char/computedVertices.h

@@ -64,14 +64,14 @@ private:
     void read_datagram(DatagramIterator &source);
   };
 
-  typedef vector<VertexTransform> VertexTransforms;
+  typedef pvector<VertexTransform> VertexTransforms;
 
   VertexTransforms _transforms;
 
-  typedef vector<ComputedVerticesMorphVertex> VertexMorphs;
-  typedef vector<ComputedVerticesMorphNormal> NormalMorphs;
-  typedef vector<ComputedVerticesMorphTexCoord> TexCoordMorphs;
-  typedef vector<ComputedVerticesMorphColor> ColorMorphs;
+  typedef pvector<ComputedVerticesMorphVertex> VertexMorphs;
+  typedef pvector<ComputedVerticesMorphNormal> NormalMorphs;
+  typedef pvector<ComputedVerticesMorphTexCoord> TexCoordMorphs;
+  typedef pvector<ComputedVerticesMorphColor> ColorMorphs;
   VertexMorphs _vertex_morphs;
   NormalMorphs _normal_morphs;
   TexCoordMorphs _texcoord_morphs;

panda/src/char/computedVerticesMorph.h

@@ -107,7 +107,7 @@ public:
   INLINE ComputedVerticesMorph(const ComputedVerticesMorph &copy);
 
   typedef MorphValueType MorphValue;
-  typedef vector<MorphValue> Morphs;
+  typedef pvector<MorphValue> Morphs;
 
   void output(ostream &out) const;
 

panda/src/collide/collisionHandlerEvent.h

@@ -72,7 +72,7 @@ private:
     INLINE void operator = (const SortEntries &other);
   };
 
-  typedef set<PT(CollisionEntry), SortEntries> Colliding;
+  typedef pset<PT(CollisionEntry), SortEntries> Colliding;
   Colliding _current_colliding;
   Colliding _last_colliding;
 

panda/src/collide/collisionHandlerPhysical.h

@@ -55,8 +55,8 @@ protected:
   virtual void handle_entries()=0;
 
 protected:
-  typedef vector< PT(CollisionEntry) > Entries;
-  typedef map<PT(CollisionNode), Entries> FromEntries;
+  typedef pvector< PT(CollisionEntry) > Entries;
+  typedef pmap<PT(CollisionNode), Entries> FromEntries;
   FromEntries _from_entries;
 
   class ColliderDef {
@@ -71,7 +71,7 @@ protected:
     PT_NodeRelation _arc;
   };
 
-  typedef map<PT(CollisionNode), ColliderDef> Colliders;
+  typedef pmap<PT(CollisionNode), ColliderDef> Colliders;
   Colliders _colliders;
 
 

panda/src/collide/collisionHandlerPusher.cxx

@@ -99,7 +99,7 @@ handle_entries() {
       // share nearly the same direction, and if so, we keep only the
       // longer of the two.
 
-      typedef vector<ShoveData> Shoves;
+      typedef pvector<ShoveData> Shoves;
       Shoves shoves;
 
       Entries::const_iterator ei;

panda/src/collide/collisionHandlerQueue.cxx

@@ -94,7 +94,7 @@ void CollisionHandlerQueue::
 sort_entries() {
   // Build up a temporary vector of entries so we can sort the
   // pointers.  This uses the class defined above.
-  typedef vector<CollisionEntrySorter> Sorter;
+  typedef pvector<CollisionEntrySorter> Sorter;
   Sorter sorter;
   sorter.reserve(_entries.size());
 

panda/src/collide/collisionHandlerQueue.h

@@ -49,7 +49,7 @@ PUBLISHED:
   CollisionEntry *get_entry(int n) const;
 
 private:
-  typedef vector< PT(CollisionEntry) > Entries;
+  typedef pvector< PT(CollisionEntry) > Entries;
   Entries _entries;
 
 public:

panda/src/collide/collisionLevelState.h

@@ -26,7 +26,7 @@
 #include <geometricBoundingVolume.h>
 #include <arcChain.h>
 
-#include <list>
+#include "plist.h"
 
 class CollisionSolid;
 class CollisionNode;

panda/src/collide/collisionNode.cxx

@@ -175,7 +175,7 @@ recompute_bound() {
 
   // Now actually compute the bounding volume by putting it around all
   // of our solids' bounding volumes.
-  vector<const BoundingVolume *> child_volumes;
+  pvector<const BoundingVolume *> child_volumes;
 
   Solids::const_iterator gi;
   for (gi = _solids.begin(); gi != _solids.end(); ++gi) {

panda/src/collide/collisionNode.h

@@ -72,7 +72,7 @@ private:
   CollideMask _into_collide_mask;
   bool _collide_geom;
 
-  typedef vector< PT(CollisionSolid) > Solids;
+  typedef pvector< PT(CollisionSolid) > Solids;
   Solids _solids;
 
 public:

panda/src/collide/collisionPolygon.cxx

@@ -163,7 +163,7 @@ xform(const LMatrix4f &mat) {
   }
 
   if (!_points.empty()) {
-    vector<LPoint3f> verts;
+    pvector<LPoint3f> verts;
     Points::const_iterator pi;
     for (pi = _points.begin(); pi != _points.end(); ++pi) {
       verts.push_back(to_3d(*pi) * mat);
@@ -219,7 +219,7 @@ recompute_bound() {
 
   // Now actually compute the bounding volume by putting it around all
   // of our vertices.
-  vector<LPoint3f> vertices;
+  pvector<LPoint3f> vertices;
   Points::const_iterator pi;
   for (pi = _points.begin(); pi != _points.end(); ++pi) {
     vertices.push_back(to_3d(*pi));

panda/src/collide/collisionSolid.cxx

@@ -166,7 +166,7 @@ test_intersection_from_segment(CollisionHandler *,
 void CollisionSolid::
 report_undefined_intersection_test(TypeHandle from_type, TypeHandle into_type) {
 #ifndef NDEBUG
-  typedef map<TypeHandle, TypeHandle> Reported;
+  typedef pmap<TypeHandle, TypeHandle> Reported;
   static Reported reported;
 
   if (reported.insert(Reported::value_type(from_type, into_type)).second) {

panda/src/collide/collisionTraverser.h

@@ -32,7 +32,7 @@
 #include <pointerTo.h>
 #include <pStatCollector.h>
 
-#include <set>
+#include "pset.h"
 
 class CollisionNode;
 class Geom;
@@ -94,12 +94,12 @@ private:
   PT(CollisionHandler) _default_handler;
   TypeHandle _graph_type;
 
-  typedef map<PT(CollisionNode),  PT(CollisionHandler) > Colliders;
+  typedef pmap<PT(CollisionNode),  PT(CollisionHandler) > Colliders;
   Colliders _colliders;
-  typedef vector<CollisionNode *> OrderedColliders;
+  typedef pvector<CollisionNode *> OrderedColliders;
   OrderedColliders _ordered_colliders;
 
-  typedef map<PT(CollisionHandler), int> Handlers;
+  typedef pmap<PT(CollisionHandler), int> Handlers;
   Handlers _handlers;
 
   // Statistics

panda/src/cull/cullState.h

@@ -32,8 +32,8 @@
 #include <referenceCount.h>
 #include <arcChain.h>
 
-#include <map>
-#include <vector>
+#include "pmap.h"
+#include "pvector.h"
 
 class GraphicsStateGuardian;
 class GeomBin;
@@ -49,8 +49,8 @@ class GeomBin;
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA CullState : public ReferenceCount {
 public:
-  typedef vector<ArcChain> CurrentGeomNodes;
-  typedef vector<ArcChain> CurrentDirectNodes;
+  typedef pvector<ArcChain> CurrentGeomNodes;
+  typedef pvector<ArcChain> CurrentDirectNodes;
 
 public:
   INLINE CullState(const AllTransitionsWrapper &trans);
@@ -107,7 +107,7 @@ private:
   AllTransitionsWrapper _trans;
   NodeAttributes *_attrib;
 
-  typedef map<Node *, UpdateSeq> Verified;
+  typedef pmap<Node *, UpdateSeq> Verified;
   Verified _verified;
 
   CurrentGeomNodes _current_geom_nodes;

panda/src/cull/cullStateLookup.h

@@ -26,7 +26,7 @@
 #include <pt_Node.h>
 #include <pt_NodeRelation.h>
 
-#include <map>
+#include "pmap.h"
 
 class CullState;
 class CullStateSubtree;
@@ -74,10 +74,10 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef map<PT_Node,  PT(CullState) > CullStates;
+  typedef pmap<PT_Node,  PT(CullState) > CullStates;
   CullStates _cull_states;
 
-  typedef map<PT_NodeRelation, CullStateSubtree *> Subtrees;
+  typedef pmap<PT_NodeRelation, CullStateSubtree *> Subtrees;
   Subtrees _subtrees;
 };
 

panda/src/cull/cullTraverser.h

@@ -31,8 +31,8 @@
 #include <nullAttributeWrapper.h>
 #include <pStatCollector.h>
 
-#include <list>
-#include <set>
+#include "plist.h"
+#include "pset.h"
 
 class GraphicsStateGuardian;
 class CullStateLookup;
@@ -119,13 +119,13 @@ private:
 
   AllAttributesWrapper _initial_state;
 
-  typedef map<string,  PT(GeomBin) > ToplevelBins;
-  typedef multimap<int,  PT(GeomBin) > SubBins;
+  typedef pmap<string,  PT(GeomBin) > ToplevelBins;
+  typedef pmultimap<int,  PT(GeomBin) > SubBins;
   ToplevelBins _toplevel_bins;
   SubBins _sub_bins;
   PT(GeomBin) _default_bin;
 
-  typedef set<PT(CullState), IndirectCompareTo<CullState> > States;
+  typedef pset<PT(CullState), IndirectCompareTo<CullState> > States;
   States _states;
 
   CullStateLookup _lookup;

panda/src/cull/geomBin.h

@@ -31,7 +31,7 @@
 #include <typedReferenceCount.h>
 #include <namable.h>
 
-#include <set>
+#include "pset.h"
 
 class GeomNode;
 class CullTraverser;

panda/src/cull/geomBinBackToFront.h

@@ -25,7 +25,7 @@
 
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomBinBackToFront
@@ -67,7 +67,7 @@ private:
     bool _is_direct;
   };
 
-  typedef multiset<NodeEntry> NodeEntries;
+  typedef pmultiset<NodeEntry> NodeEntries;
   NodeEntries _node_entries;
 
 public:

panda/src/cull/geomBinFixed.h

@@ -25,7 +25,7 @@
 
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomBinFixed
@@ -64,7 +64,7 @@ private:
     bool _is_direct;
   };
 
-  typedef multiset<NodeEntry> NodeEntries;
+  typedef pmultiset<NodeEntry> NodeEntries;
   NodeEntries _node_entries;
 
 public:

panda/src/cull/geomBinGroup.h

@@ -25,7 +25,7 @@
 
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomBinGroup
@@ -65,7 +65,7 @@ protected:
   virtual PT(GeomBin) detach();
 
 private:
-  typedef vector< PT(GeomBin) > SubBins;
+  typedef pvector< PT(GeomBin) > SubBins;
   SubBins _sub_bins;
 
 public:

panda/src/cull/geomBinNormal.h

@@ -25,7 +25,7 @@
 
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomBinNormal

panda/src/cull/geomBinUnsorted.h

@@ -25,7 +25,7 @@
 
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GeomBinUnsorted
@@ -52,7 +52,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef vector< PT(CullState) > CullStates;
+  typedef pvector< PT(CullState) > CullStates;
   CullStates _cull_states;
 
 public:

panda/src/device/clientAnalogDevice.h

@@ -61,7 +61,7 @@ protected:
     bool _known;
   };
 
-  typedef vector<AnalogState> Controls;
+  typedef pvector<AnalogState> Controls;
   Controls _controls;
 
 

panda/src/device/clientBase.h

@@ -34,7 +34,7 @@
 #include <ipc_thread.h>
 #endif
 
-#include <map>
+#include "pmap.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : ClientBase
@@ -74,8 +74,8 @@ protected:
   virtual void do_poll();
 
 private:
-  typedef map<string, ClientDevice *> DevicesByName;
-  typedef map<TypeHandle, DevicesByName> Devices;
+  typedef pmap<string, ClientDevice *> DevicesByName;
+  typedef pmap<TypeHandle, DevicesByName> Devices;
   Devices _devices;
 
   bool _forked;

panda/src/device/clientButtonDevice.h

@@ -78,7 +78,7 @@ protected:
     State _state;
   };
 
-  typedef vector<ButtonState> Buttons;
+  typedef pvector<ButtonState> Buttons;
   Buttons _buttons;
 
   PT(ButtonEventDataAttribute) _button_events;

panda/src/device/clientDialDevice.h

@@ -59,7 +59,7 @@ protected:
     bool _known;
   };
 
-  typedef vector<DialState> Dials;
+  typedef pvector<DialState> Dials;
   Dials _dials;
 
 

panda/src/dgraph/buttonEventDataAttribute.h

@@ -24,7 +24,7 @@
 #include <nodeAttribute.h>
 #include <buttonEvent.h>
 
-#include <vector>
+#include "pvector.h"
 
 class ButtonEventDataTransition;
 class ModifierButtons;
@@ -38,7 +38,7 @@ class ModifierButtons;
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA ButtonEventDataAttribute : public NodeAttribute {
 private:
-  typedef vector<ButtonEvent> Buttons;
+  typedef pvector<ButtonEvent> Buttons;
 
 public:
   INLINE ButtonEventDataAttribute();

panda/src/dgraph/dataGraphTraverser.h

@@ -59,7 +59,7 @@ private:
   void resume(Node *node, SavedState &state);
   void resume_all();
 
-  typedef map<Node *, SavedState> States;
+  typedef pmap<Node *, SavedState> States;
   States _saved_states;
 };
 

panda/src/display/config_display.h

@@ -24,7 +24,7 @@
 #include <dconfig.h>
 
 #include <string>
-#include <vector>
+#include "pvector.h"
 
 NotifyCategoryDecl(display, EXPCL_PANDA, EXPTP_PANDA);
 NotifyCategoryDecl(gsg, EXPCL_PANDA, EXPTP_PANDA);

panda/src/display/displayRegion.h

@@ -26,7 +26,7 @@
 #include <referenceCount.h>
 #include <camera.h>
 
-#include <list>
+#include "plist.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines

panda/src/display/display_headers.h

@@ -32,7 +32,7 @@
 #include "textureContext.h"
 
 #include <algorithm>
-#include <map>
+#include "pmap.h"
 
 #pragma hdrstop
 

panda/src/display/graphicsChannel.cxx

@@ -26,7 +26,7 @@
 #include "graphicsWindow.h"
 #include "config_display.h"
 
-#include <map>
+#include "pmap.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////

panda/src/display/graphicsChannel.h

@@ -28,7 +28,7 @@
 #include <typedReferenceCount.h>
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines
@@ -75,7 +75,7 @@ private:
   GraphicsWindow *_window;
   bool _is_active;
 
-  typedef vector< PT(GraphicsLayer) > GraphicsLayers;
+  typedef pvector< PT(GraphicsLayer) > GraphicsLayers;
   GraphicsLayers _layers;
 
 private:

panda/src/display/graphicsLayer.h

@@ -29,7 +29,7 @@
 #include <typedReferenceCount.h>
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines
@@ -82,7 +82,7 @@ private:
   GraphicsChannel *_channel;
   bool _is_active;
 
-  typedef vector< PT(DisplayRegion) > DisplayRegions;
+  typedef pvector< PT(DisplayRegion) > DisplayRegions;
   DisplayRegions _display_regions;
 
 private:

panda/src/display/graphicsPipe.h

@@ -33,7 +33,7 @@
 #include <factoryParam.h>
 
 #include <string>
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines
@@ -115,8 +115,8 @@ protected:
 private:
   // Some private type declarations.  These must be declared here so
   // we can declare the public iterator types, below.
-  typedef vector< PT(GraphicsWindow) > Windows;
-  typedef vector<GraphicsPipe *> Pipes;
+  typedef pvector< PT(GraphicsWindow) > Windows;
+  typedef pvector<GraphicsPipe *> Pipes;
 
   Windows _windows;
 

panda/src/display/graphicsStateGuardian.h

@@ -33,7 +33,7 @@
 #include <renderTraverser.h>
 #include <pStatCollector.h>
 
-#include <list>
+#include "plist.h"
 
 class AllAttributesWrapper;
 class AllTransitionsWrapper;
@@ -155,7 +155,7 @@ protected:
   void init_frame_pstats();
   void add_to_texture_record(TextureContext *tc);
   void record_state_change(TypeHandle type);
-  set<TextureContext *> _current_textures;
+  pset<TextureContext *> _current_textures;
 #else
   INLINE void init_frame_pstats() { }
   INLINE void add_to_texture_record(TextureContext *) { }
@@ -208,7 +208,7 @@ public:
   static PStatCollector _geom_nodes_pcollector;
 
 private:
-  typedef set<TextureContext *> Textures;
+  typedef pset<TextureContext *> Textures;
   Textures _prepared_textures;  // NOTE: on win32 another DLL (e.g. libpandadx.dll) cannot access set directly due to exported template issue
 
 public:

panda/src/display/graphicsWindow.cxx

@@ -29,7 +29,7 @@
 #include <mouseButton.h>
 #include <keyboardButton.h>
 
-#include <map>
+#include "pmap.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////

panda/src/display/graphicsWindow.h

@@ -39,8 +39,8 @@
 #include <pStatCollector.h>
 
 #include <string>
-#include <vector>
-#include <deque>
+#include "pvector.h"
+#include "pdeque.h"
 
 ////////////////////////////////////////////////////////////////////
 // Defines
@@ -207,7 +207,7 @@ protected:
   void declare_channel(int index, GraphicsChannel *chan);
 
 private:
-  typedef vector< PT(GraphicsChannel) > Channels;
+  typedef pvector< PT(GraphicsChannel) > Channels;
   Channels _channels;
 
 public:

panda/src/display/graphicsWindowInputDevice.h

@@ -24,8 +24,8 @@
 #include <buttonEvent.h>
 #include <mouseData.h>
 
-#include <deque>
-#include <vector>
+#include "pdeque.h"
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsWindowInputDevice
@@ -68,7 +68,7 @@ public:
 
 public:
   // We need these methods to make VC++ happy when we try to
-  // instantiate a vector<GraphicsWindowInputDevice>.  They don't do
+  // instantiate a pvector<GraphicsWindowInputDevice>.  They don't do
   // anything useful.
   INLINE bool operator == (const GraphicsWindowInputDevice &other) const;
   INLINE bool operator != (const GraphicsWindowInputDevice &other) const;
@@ -79,7 +79,7 @@ private:
     IDF_has_pointer    = 0x01,
     IDF_has_keyboard   = 0x02
   };
-  typedef deque<ButtonEvent> ButtonEvents;
+  typedef pdeque<ButtonEvent> ButtonEvents;
 
   string _name;
   int _flags;

panda/src/downloader/asyncDownloader.cxx

@@ -35,7 +35,7 @@
 
 #include "asyncDownloader.h"
 #include <circBuffer.h>
-#include <list>
+#include "plist.h"
 
 #if !defined(WIN32_VC)
 // #define errno wsaGetLastError()

panda/src/downloader/downloadDb.cxx

@@ -329,7 +329,7 @@ server_add_file(string mfname, string fname) {
   PT(FileRecord) fr = new FileRecord(fname);
 
   // Find the multifile with mfname
-  vector< PT(MultifileRecord) >::iterator i = _server_db._mfile_records.begin();
+  pvector< 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);
@@ -390,7 +390,7 @@ output(ostream &out) const {
       << "     size: " << _size    << endl
       << "   status: " << _status  << endl;
   out << "--------------------------------------------------" << endl;
-  vector< PT(FileRecord) >::const_iterator i = _file_records.begin();
+  pvector< PT(FileRecord) >::const_iterator i = _file_records.begin();
   for(; i != _file_records.end(); ++i) {
     (*i)->output(out);
   }
@@ -426,7 +426,7 @@ get_file_name(int index) const {
 ////////////////////////////////////////////////////////////////////
 bool DownloadDb::MultifileRecord::
 file_exists(string fname) const {
-  vector< PT(FileRecord) >::const_iterator i = _file_records.begin();
+  pvector< PT(FileRecord) >::const_iterator i = _file_records.begin();
   for(; i != _file_records.end(); ++i) {
     if (fname == (*i)->_name) {
       return true;
@@ -443,7 +443,7 @@ file_exists(string fname) const {
 ////////////////////////////////////////////////////////////////////
 PT(DownloadDb::FileRecord) DownloadDb::MultifileRecord::
 get_file_record_named(string fname) const {
-  vector< PT(FileRecord) >::const_iterator i = _file_records.begin();
+  pvector< PT(FileRecord) >::const_iterator i = _file_records.begin();
   for(; i != _file_records.end(); ++i) {
     if (fname == (*i)->_name) {
       return (*i);
@@ -495,7 +495,7 @@ Db(void) {
 ////////////////////////////////////////////////////////////////////
 void DownloadDb::Db::
 output(ostream &out) const {
-  vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
+  pvector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
   for(; i != _mfile_records.end(); ++i) {
     (*i)->output(out);
   }
@@ -529,7 +529,7 @@ get_multifile_name(int index) const {
 ////////////////////////////////////////////////////////////////////
 bool DownloadDb::Db::
 multifile_exists(string mfname) const {
-  vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
+  pvector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
   for(; i != _mfile_records.end(); ++i) {
     if (mfname == (*i)->_name) {
       return true;
@@ -545,7 +545,7 @@ multifile_exists(string mfname) const {
 ////////////////////////////////////////////////////////////////////
 PT(DownloadDb::MultifileRecord) DownloadDb::Db::
 get_multifile_record_named(string mfname) const {
-  vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
+  pvector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
   for(; i != _mfile_records.end(); ++i) {
     if (mfname == (*i)->_name) {
       return (*i);
@@ -806,7 +806,7 @@ write(ofstream &write_stream, bool want_server_info) {
   PN_int32 header_length;
 
   // Iterate over the multifiles writing them to the stream
-  vector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
+  pvector< PT(MultifileRecord) >::const_iterator i = _mfile_records.begin();
   for(; i != _mfile_records.end(); ++i) {
     _datagram.clear();
 
@@ -847,7 +847,7 @@ write(ofstream &write_stream, bool want_server_info) {
     if (want_server_info) {
       // Now iterate over this multifile's files writing them to the stream
       // Iterate over the multifiles writing them to the stream
-      vector< PT(FileRecord) >::const_iterator j = (*i)->_file_records.begin();
+      pvector< 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();

panda/src/downloader/downloadDb.h

@@ -26,10 +26,10 @@
 #include <filename.h>
 #include <multifile.h>
 
-#include <vector>
+#include "pvector.h"
 #include <string>
 #include <pointerTo.h>
-#include <map>
+#include "pmap.h"
 
 #include "hashVal.h"
 #include <buffer.h>
@@ -134,7 +134,7 @@ public:
     string _name;
   };
 
-  typedef vector< PT(FileRecord) > FileRecords;
+  typedef pvector< PT(FileRecord) > FileRecords;
 
   class EXPCL_PANDAEXPRESS MultifileRecord : public ReferenceCount {
   public:
@@ -154,7 +154,7 @@ public:
     FileRecords _file_records;
   };
 
-  typedef vector< PT(MultifileRecord) > MultifileRecords;
+  typedef pvector< PT(MultifileRecord) > MultifileRecords;
 
   class EXPCL_PANDAEXPRESS Db {
   public:
@@ -197,8 +197,8 @@ public:
   // Magic number for knowing this is a download Db
   static PN_uint32 _magic_number;
   static PN_uint32 _bogus_magic_number;
-  typedef vector<HashVal> vectorHash;
-  typedef map<string, vectorHash> VersionMap;
+  typedef pvector<HashVal> vectorHash;
+  typedef pmap<string, vectorHash> VersionMap;
 
 PUBLISHED:
   void add_version(const Filename &name, HashVal hash, Version version);