vector -> pvector, etc.

pandatool/src/bam/bamInfo.h

@@ -26,7 +26,7 @@
 #include <pt_Node.h>
 #include <sceneGraphAnalyzer.h>
 
-#include <vector>
+#include "pvector.h"
 
 class TypedWritable;
 
@@ -49,7 +49,7 @@ private:
   void describe_general_object(TypedWritable *object);
   void list_hierarchy(Node *node, int indent_level);
 
-  typedef vector<Filename> Filenames;
+  typedef pvector<Filename> Filenames;
   Filenames _filenames;
 
   bool _ls;

pandatool/src/cvscopy/cvsCopy.h

@@ -81,7 +81,7 @@ protected:
   CVSSourceDirectory *_model_dir;
   CVSSourceDirectory *_map_dir;
 
-  typedef map<string, CVSSourceDirectory *> CopiedFiles;
+  typedef pmap<string, CVSSourceDirectory *> CopiedFiles;
   CopiedFiles _copied_files;
 };
 

pandatool/src/cvscopy/cvsSourceDirectory.h

@@ -22,7 +22,7 @@
 #include <pandatoolbase.h>
 #include <filename.h>
 
-#include <vector>
+#include "pvector.h"
 
 class CVSSourceTree;
 
@@ -59,7 +59,7 @@ private:
   string _dirname;
   int _depth;
 
-  typedef vector<CVSSourceDirectory *> Children;
+  typedef pvector<CVSSourceDirectory *> Children;
   Children _children;
 };
 

pandatool/src/cvscopy/cvsSourceTree.h

@@ -21,8 +21,8 @@
 
 #include <pandatoolbase.h>
 
-#include <vector>
+#include "pvector.h"
-#include <map>
+#include "pmap.h"
 
 class CVSSourceDirectory;
 
@@ -58,7 +58,7 @@ public:
   void add_file(const string &filename, CVSSourceDirectory *dir);
 
 private:
-  typedef vector<CVSSourceDirectory *> Directories;
+  typedef pvector<CVSSourceDirectory *> Directories;
 
   CVSSourceDirectory *
   prompt_user(const string &filename, CVSSourceDirectory *suggested_dir,
@@ -81,7 +81,7 @@ private:
   string _path;
   CVSSourceDirectory *_root;
 
-  typedef map<string, Directories> Filenames;
+  typedef pmap<string, Directories> Filenames;
   Filenames _filenames;
 
   static bool _got_start_fullpath;

pandatool/src/egg-mkfont/charBitmap.h

@@ -22,7 +22,7 @@
 
 #include <pandatoolbase.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CharBitmap
@@ -32,8 +32,8 @@
 ////////////////////////////////////////////////////////////////////
 class CharBitmap {
 public:
-  typedef vector<char> Row;
+  typedef pvector<char> Row;
-  typedef vector<Row> Block;
+  typedef pvector<Row> Block;
 
   CharBitmap(int character, int width, int height,
              int hoff, int voff, double dx, double dy);

pandatool/src/egg-mkfont/charLayout.h

@@ -23,7 +23,7 @@
 
 #include "charPlacement.h"
 
-#include <vector>
+#include "pvector.h"
 
 class CharPlacement;
 
@@ -40,7 +40,7 @@ public:
 
   bool place_character(const CharBitmap *bm);
 
-  typedef vector<CharPlacement> Placements;
+  typedef pvector<CharPlacement> Placements;
   Placements _placements;
 
   int _working_xsize, _working_ysize;

pandatool/src/egg-mkfont/eggMakeFont.h

@@ -91,7 +91,7 @@ private:
   double _small_caps_scale;
 
   FontFile *_font;
-  typedef map<int, PT(EggGroup)> EggDefs;
+  typedef pmap<int, PT(EggGroup)> EggDefs;
   EggDefs _egg_defs;
 
   CharLayout _layout;

pandatool/src/egg-mkfont/fontFile.h

@@ -56,7 +56,7 @@ protected:
   double _vppp;
   double _hppp;
 
-  typedef vector<CharBitmap *> Chars;
+  typedef pvector<CharBitmap *> Chars;
   Chars _chars;
 };
 

pandatool/src/egg-mkfont/pkFontFile.h

@@ -58,7 +58,7 @@ private:
   bool _extract_all;
   string _extract_only;
 
-  vector<unsigned char> _pk;
+  pvector<unsigned char> _pk;
 };
 
 #endif

pandatool/src/egg-palettize/eggFile.h

@@ -28,7 +28,7 @@
 #include <namable.h>
 #include <typedWritable.h>
 
-#include <set>
+#include "pset.h"
 
 class SourceTextureImage;
 class EggData;
@@ -51,7 +51,7 @@ public:
                          const Filename &dest_filename);
 
   void scan_textures();
-  void get_textures(set<TextureImage *> &result) const;
+  void get_textures(pset<TextureImage *> &result) const;
 
   void pre_txa_file();
   void match_txa_groups(const PaletteGroups &groups);
@@ -85,7 +85,7 @@ private:
   Filename _source_filename;
   Filename _dest_filename;
 
-  typedef vector<TextureReference *> Textures;
+  typedef pvector<TextureReference *> Textures;
   Textures _textures;
 
   bool _first_txa_match;

pandatool/src/egg-palettize/filenameUnifier.h

@@ -23,7 +23,7 @@
 
 #include <filename.h>
 
-#include <map>
+#include "pmap.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : FilenameUnifier
@@ -52,7 +52,7 @@ private:
   static Filename _txa_dir;
   static Filename _rel_dirname;
 
-  typedef map<string, string> CanonicalFilenames;
+  typedef pmap<string, string> CanonicalFilenames;
   static CanonicalFilenames _canonical_filenames;
 };
 

pandatool/src/egg-palettize/paletteGroup.h

@@ -27,8 +27,8 @@
 #include <namable.h>
 #include <typedWritable.h>
 
-#include <set>
+#include "pset.h"
-#include <vector>
+#include "pvector.h"
 
 class EggFile;
 class TexturePlacement;
@@ -59,8 +59,8 @@ public:
   void group_with(PaletteGroup *other);
   const PaletteGroups &get_groups() const;
 
-  void get_placements(vector<TexturePlacement *> &placements) const;
+  void get_placements(pvector<TexturePlacement *> &placements) const;
-  void get_complete_placements(vector<TexturePlacement *> &placements) const;
+  void get_complete_placements(pvector<TexturePlacement *> &placements) const;
 
   void reset_dependency_level();
   void set_dependency_level(int level);
@@ -97,10 +97,10 @@ private:
   int _dependency_order;
   int _dirname_order;
 
-  typedef set<TexturePlacement *> Placements;
+  typedef pset<TexturePlacement *> Placements;
   Placements _placements;
 
-  typedef map<TextureProperties, PalettePage *> Pages;
+  typedef pmap<TextureProperties, PalettePage *> Pages;
   Pages _pages;
 
 
@@ -121,7 +121,7 @@ private:
   // don't use them otherwise.
   int _num_placements;
   int _num_pages;
-  vector<PalettePage *> _load_pages;
+  pvector<PalettePage *> _load_pages;
 
 public:
   static TypeHandle get_class_type() {

pandatool/src/egg-palettize/paletteGroups.h

@@ -23,7 +23,7 @@
 
 #include <typedWritable.h>
 
-#include <set>
+#include "pset.h"
 
 class PaletteGroup;
 
@@ -35,7 +35,7 @@ class PaletteGroup;
 ////////////////////////////////////////////////////////////////////
 class PaletteGroups : public TypedWritable {
 private:
-  typedef set<PaletteGroup *> Groups;
+  typedef pset<PaletteGroup *> Groups;
 
 public:
 #ifndef WIN32_VC

pandatool/src/egg-palettize/paletteImage.h

@@ -86,10 +86,10 @@ private:
     int _x_size, _y_size;
   };
 
-  typedef vector<ClearedRegion> ClearedRegions;
+  typedef pvector<ClearedRegion> ClearedRegions;
   ClearedRegions _cleared_regions;
 
-  typedef vector<TexturePlacement *> Placements;
+  typedef pvector<TexturePlacement *> Placements;
   Placements _placements;
 
   PalettePage *_page;

pandatool/src/egg-palettize/palettePage.h

@@ -63,10 +63,10 @@ private:
   PaletteGroup *_group;
   TextureProperties _properties;
 
-  typedef vector<TexturePlacement *> Assigned;
+  typedef pvector<TexturePlacement *> Assigned;
   Assigned _assigned;
 
-  typedef vector<PaletteImage *> Images;
+  typedef pvector<PaletteImage *> Images;
   Images _images;
 
   // The TypedWritable interface follows.

pandatool/src/egg-palettize/palettizer.h

@@ -25,9 +25,9 @@
 
 #include <typedWritable.h>
 
-#include <vector>
+#include "pvector.h"
-#include <set>
+#include "pset.h"
-#include <map>
+#include "pmap.h"
 
 class PNMFileType;
 class EggFile;
@@ -112,23 +112,23 @@ public:
   PNMFileType *_shadow_alpha_type;
 
 private:
-  typedef vector<TexturePlacement *> Placements;
+  typedef pvector<TexturePlacement *> Placements;
   void compute_statistics(ostream &out, int indent_level,
                           const Placements &placements) const;
 
-  typedef map<string, EggFile *> EggFiles;
+  typedef pmap<string, EggFile *> EggFiles;
   EggFiles _egg_files;
 
-  typedef vector<EggFile *> CommandLineEggs;
+  typedef pvector<EggFile *> CommandLineEggs;
   CommandLineEggs _command_line_eggs;
 
-  typedef set<TextureImage *> CommandLineTextures;
+  typedef pset<TextureImage *> CommandLineTextures;
   CommandLineTextures _command_line_textures;
 
-  typedef map<string, PaletteGroup *> Groups;
+  typedef pmap<string, PaletteGroup *> Groups;
   Groups _groups;
 
-  typedef map<string, TextureImage *> Textures;
+  typedef pmap<string, TextureImage *> Textures;
   Textures _textures;
 
 

pandatool/src/egg-palettize/textureImage.h

@@ -29,8 +29,8 @@
 #include <filename.h>
 #include <pnmImage.h>
 
-#include <map>
+#include "pmap.h"
-#include <set>
+#include "pset.h"
 
 class SourceTextureImage;
 class DestTextureImage;
@@ -88,10 +88,10 @@ public:
   void write_scale_info(ostream &out, int indent_level = 0);
 
 private:
-  typedef set<EggFile *> EggFiles;
+  typedef pset<EggFile *> EggFiles;
-  typedef vector<EggFile *> WorkingEggs;
+  typedef pvector<EggFile *> WorkingEggs;
-  typedef map<string, SourceTextureImage *> Sources;
+  typedef pmap<string, SourceTextureImage *> Sources;
-  typedef map<string, DestTextureImage *> Dests;
+  typedef pmap<string, DestTextureImage *> Dests;
 
   static int compute_egg_count(PaletteGroup *group,
                                const WorkingEggs &egg_files);
@@ -121,7 +121,7 @@ private:
 
   EggFiles _egg_files;
 
-  typedef map<PaletteGroup *, TexturePlacement *> Placement;
+  typedef pmap<PaletteGroup *, TexturePlacement *> Placement;
   Placement _placement;
 
   Sources _sources;

pandatool/src/egg-palettize/textureMemoryCounter.h

@@ -27,8 +27,8 @@ class TextureImage;
 class DestTextureImage;
 class TexturePlacement;
 
-#include <map>
+#include "pmap.h"
-#include <set>
+#include "pset.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TextureMemoryCounter
@@ -64,10 +64,10 @@ private:
   int _duplicate_bytes;
   int _coverage_bytes;
 
-  typedef map<TextureImage *, int> Textures;
+  typedef pmap<TextureImage *, int> Textures;
   Textures _textures;
 
-  typedef set<PaletteImage *> Palettes;
+  typedef pset<PaletteImage *> Palettes;
   Palettes _palettes;
 };
 

pandatool/src/egg-palettize/texturePlacement.h

@@ -27,7 +27,7 @@
 #include <typedWritable.h>
 #include <luse.h>
 
-#include <set>
+#include "pset.h"
 
 class TextureImage;
 class DestTextureImage;
@@ -112,7 +112,7 @@ private:
   TexturePosition _placed;
   OmitReason _omit_reason;
 
-  typedef set<TextureReference *> References;
+  typedef pset<TextureReference *> References;
   References _references;
 
   // The TypedWritable interface follows.

pandatool/src/egg-palettize/txaFile.h

@@ -26,7 +26,7 @@
 #include <filename.h>
 #include <vector_string.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : TxaFile
@@ -56,7 +56,7 @@ private:
   bool parse_remap_line(const vector_string &words);
   bool parse_remapchar_line(const vector_string &words);
 
-  typedef vector<TxaLine> Lines;
+  typedef pvector<TxaLine> Lines;
   Lines _lines;
 };
 

pandatool/src/egg-palettize/txaLine.h

@@ -26,7 +26,7 @@
 #include <globPattern.h>
 #include <eggTexture.h>
 
-#include <vector>
+#include "pvector.h"
 
 class PNMFileType;
 class EggFile;
@@ -51,7 +51,7 @@ public:
   void output(ostream &out) const;
 
 private:
-  typedef vector<GlobPattern> Patterns;
+  typedef pvector<GlobPattern> Patterns;
   Patterns _texture_patterns;
   Patterns _egg_patterns;
 
@@ -82,7 +82,7 @@ private:
     KW_cont
   };
 
-  typedef vector<Keyword> Keywords;
+  typedef pvector<Keyword> Keywords;
   Keywords _keywords;
 
   PaletteGroups _palette_groups;

pandatool/src/eggbase/eggMultiBase.h

@@ -50,7 +50,7 @@ protected:
   bool _got_coordinate_system;
   CoordinateSystem _coordinate_system;
 
-  typedef vector<PT(EggData)> Eggs;
+  typedef pvector<PT(EggData)> Eggs;
   Eggs _eggs;
 
   bool _force_complete;

pandatool/src/eggcharbase/eggCharacterCollection.h

@@ -66,15 +66,15 @@ public:
   class EggInfo {
   public:
     PT(EggData) _egg;
-    typedef vector<PT(EggNode)> Models;
+    typedef pvector<PT(EggNode)> Models;
     Models _models;
     int _first_model_index;
   };
 
-  typedef vector<EggInfo> Eggs;
+  typedef pvector<EggInfo> Eggs;
   Eggs _eggs;
 
-  typedef vector<EggCharacterData *> Characters;
+  typedef pvector<EggCharacterData *> Characters;
   Characters _characters;
   Characters _characters_by_model_index;
 
@@ -92,9 +92,9 @@ private:
   void add_morph_back_pointers(EggAttributes *attrib, EggObject *egg_object,
                                int model_index, EggCharacterData *char_data);
 
-  typedef vector<EggNode *> EggNodeList;
+  typedef pvector<EggNode *> EggNodeList;
-  typedef map<EggNode *, EggNodeList> TopEggNodes;
+  typedef pmap<EggNode *, EggNodeList> TopEggNodes;
-  typedef map<string, TopEggNodes> TopEggNodesByName;
+  typedef pmap<string, TopEggNodes> TopEggNodesByName;
   TopEggNodesByName _top_egg_nodes;
 
   int _next_model_index;

pandatool/src/eggcharbase/eggCharacterData.h

@@ -27,7 +27,7 @@
 #include <pointerTo.h>
 #include <namable.h>
 
-#include <map>
+#include "pmap.h"
 
 class EggCharacterCollection;
 class EggSliderData;
@@ -82,13 +82,13 @@ protected:
     int _model_index;
     PT(EggNode) _model_root;
   };
-  typedef vector<Model> Models;
+  typedef pvector<Model> Models;
   Models _models;
 
   EggCharacterCollection *_collection;
   EggJointData *_root_joint;
 
-  typedef map<string, EggSliderData *> Sliders;
+  typedef pmap<string, EggSliderData *> Sliders;
   Sliders _sliders;
 };
 

pandatool/src/eggcharbase/eggComponentData.h

@@ -57,7 +57,7 @@ protected:
 
   // This points back to all the egg structures that reference this
   // particular table or slider.
-  typedef vector<EggBackPointer *> BackPointers;
+  typedef pvector<EggBackPointer *> BackPointers;
   BackPointers _back_pointers;
 
 

pandatool/src/eggcharbase/eggJointData.h

@@ -53,7 +53,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 protected:
-  typedef vector<EggJointData *> Children;
+  typedef pvector<EggJointData *> Children;
   Children _children;
   EggJointData *_parent;
 

pandatool/src/eggcharbase/eggJointPointer.h

@@ -48,7 +48,7 @@ public:
   virtual void optimize();
 
 protected:
-  typedef vector<LMatrix4d> RebuildFrames;
+  typedef pvector<LMatrix4d> RebuildFrames;
   RebuildFrames _rebuild_frames;
 
 public:

pandatool/src/eggprogs/eggTopstrip.h

@@ -24,7 +24,7 @@
 #include <eggCharacterFilter.h>
 #include <luse.h>
 
-#include <vector>
+#include "pvector.h"
 
 class EggJointData;
 class EggJointPointer;

pandatool/src/flt/fltBead.h

@@ -68,7 +68,7 @@ private:
   bool _has_transform;
   LMatrix4d _transform;
 
-  typedef vector<PT(FltTransformRecord)> Transforms;
+  typedef pvector<PT(FltTransformRecord)> Transforms;
   Transforms _transform_steps;
 
   int _replicate_count;

pandatool/src/flt/fltCurve.h

@@ -40,7 +40,7 @@ public:
     CT_bezier              = 6
   };
 
-  typedef vector<LPoint3d> ControlPoints;
+  typedef pvector<LPoint3d> ControlPoints;
 
   CurveType _curve_type;
   ControlPoints _control_points;

pandatool/src/flt/fltHeader.h

@@ -240,18 +240,18 @@ private:
   // Instance subtrees.  These are standalone subtrees, which may be
   // referenced by various points in the hierarchy, stored by instance
   // ID number.
-  typedef map<int, PT(FltInstanceDefinition)> Instances;
+  typedef pmap<int, PT(FltInstanceDefinition)> Instances;
   Instances _instances;
 
 
   // Support for the vertex palette.
   int update_vertex_lookups();
 
-  typedef vector<PT(FltVertex)> Vertices;
+  typedef pvector<PT(FltVertex)> Vertices;
-  typedef set<FltVertex *> UniqueVertices;
+  typedef pset<FltVertex *> UniqueVertices;
 
-  typedef map<int, FltVertex *> VerticesByOffset;
+  typedef pmap<int, FltVertex *> VerticesByOffset;
-  typedef map<FltVertex *, int> OffsetsByVertex;
+  typedef pmap<FltVertex *, int> OffsetsByVertex;
 
   Vertices _vertices;
   UniqueVertices _unique_vertices;
@@ -267,26 +267,26 @@ private:
 
   // Support for the color palette.
   bool _got_color_palette;
-  typedef vector<FltPackedColor> Colors;
+  typedef pvector<FltPackedColor> Colors;
-  typedef map<int, string> ColorNames;
+  typedef pmap<int, string> ColorNames;
   Colors _colors;
   ColorNames _color_names;
 
 
   // Support for the material palette.
   bool _got_14_material_palette;
-  typedef map<int, PT(FltMaterial)> Materials;
+  typedef pmap<int, PT(FltMaterial)> Materials;
   Materials _materials;
 
 
   // Support for the texture palette.
   AttrUpdate _auto_attr_update;
-  typedef map<int, PT(FltTexture)> Textures;
+  typedef pmap<int, PT(FltTexture)> Textures;
   Textures _textures;
 
 
   // Support for the light source palette.
-  typedef map<int, PT(FltLightSourceDefinition)> LightSources;
+  typedef pmap<int, PT(FltLightSourceDefinition)> LightSources;
   LightSources _light_sources;
 
 

pandatool/src/flt/fltLocalVertexPool.h

@@ -53,7 +53,7 @@ public:
     AM_has_uv_7          = 0x00100000
   };
 
-  typedef vector<PT(FltVertex)> Vertices;
+  typedef pvector<PT(FltVertex)> Vertices;
   Vertices _vertices;
 
 public:

pandatool/src/flt/fltRecord.h

@@ -94,7 +94,7 @@ protected:
   FltHeader *_header;
 
 private:
-  typedef vector<PT(FltRecord)> Records;
+  typedef pvector<PT(FltRecord)> Records;
   Records _children;
   Records _subfaces;
   Records _extensions;

pandatool/src/flt/fltRecordWriter.h

@@ -55,7 +55,7 @@ private:
   Datagram _datagram;
   FltOpcode _opcode;
 
-  typedef set<int> Instances;
+  typedef pset<int> Instances;
   Instances _instances_written;
 };
 

pandatool/src/flt/fltTexture.h

@@ -156,7 +156,7 @@ public:
     LPoint2d _real_earth;
   };
 
-  typedef vector<GeospecificControlPoint> GeospecificControlPoints;
+  typedef pvector<GeospecificControlPoint> GeospecificControlPoints;
 
   struct SubtextureDef {
     string _name;
@@ -165,7 +165,7 @@ public:
     int _right;
     int _top;
   };
-  typedef vector<SubtextureDef> SubtextureDefs;
+  typedef pvector<SubtextureDef> SubtextureDefs;
 
   int _num_texels_u;
   int _num_texels_v;

pandatool/src/flt/fltVertexList.h

@@ -48,7 +48,7 @@ protected:
   virtual bool build_record(FltRecordWriter &writer) const;
 
 private:
-  typedef vector<PT(FltVertex)> Vertices;
+  typedef pvector<PT(FltVertex)> Vertices;
   Vertices _vertices;
 
 public:

pandatool/src/fltegg/fltToEggConverter.h

@@ -70,7 +70,7 @@ public:
 private:
   void cleanup();
 
-  typedef vector< PT_EggVertex > EggVertices;
+  typedef pvector< PT_EggVertex > EggVertices;
 
   void convert_record(const FltRecord *flt_record, FltToEggLevelState &state);
   void dispatch_record(const FltRecord *flt_record, FltToEggLevelState &state);
@@ -102,7 +102,7 @@ private:
 
   PT(EggVertexPool) _main_egg_vpool;
 
-  typedef map<const FltTexture *, PT(EggTexture) > Textures;
+  typedef pmap<const FltTexture *, PT(EggTexture) > Textures;
   Textures _textures;
 };
 

pandatool/src/fltegg/fltToEggLevelState.h

@@ -56,7 +56,7 @@ private:
     EggGroup *_plain;
   };
 
-  typedef map<LMatrix4d, ParentNodes *> Parents;
+  typedef pmap<LMatrix4d, ParentNodes *> Parents;
   Parents _parents;
 };
 

pandatool/src/fltprogs/fltCopy.h

@@ -26,7 +26,7 @@
 #include <dSearchPath.h>
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 class FltRecord;
 class FltTexture;
@@ -68,8 +68,8 @@ private:
                     bool new_file);
 
 
-  typedef set<PT(FltExternalReference)> Refs;
+  typedef pset<PT(FltExternalReference)> Refs;
-  typedef set<PT(FltTexture)> Textures;
+  typedef pset<PT(FltTexture)> Textures;
 
   void scan_flt(FltRecord *record, Refs &refs, Textures &textures);
 

pandatool/src/gtk-stats/gtkStatsMonitor.h

@@ -24,7 +24,7 @@
 #include <pStatMonitor.h>
 #include <pointerTo.h>
 
-#include <set>
+#include "pset.h"
 
 
 class GtkStatsWindow;
@@ -58,7 +58,7 @@ public:
   void add_window(GtkStatsWindow *window);
   void remove_window(GtkStatsWindow *window);
 
-  typedef set<GtkStatsWindow *> Windows;
+  typedef pset<GtkStatsWindow *> Windows;
   Windows _windows;
 
   bool _destructing;

pandatool/src/gtk-stats/gtkStatsPianoRoll.h

@@ -27,7 +27,7 @@
 #include <pointerTo.h>
 
 #include <gtk--.h>
-#include <map>
+#include "pmap.h"
 
 class PStatView;
 class GtkStatsGuide;
@@ -74,7 +74,7 @@ private:
   Gdk_GC _light_gc;
 
   // Table of graphics contexts for our various collectors.
-  typedef map<int, Gdk_GC> GCs;
+  typedef pmap<int, Gdk_GC> GCs;
   GCs _gcs;
 
   // Table of Y-positions for each of our rows, measured from the

pandatool/src/gtk-stats/gtkStatsStripChart.h

@@ -27,7 +27,7 @@
 #include <pointerTo.h>
 
 #include <gtk--.h>
-#include <map>
+#include "pmap.h"
 
 class PStatView;
 class GtkStatsGuide;
@@ -83,7 +83,7 @@ private:
   Gdk_GC _light_gc;
 
   // Table of graphics contexts for our various collectors.
-  typedef map<int, Gdk_GC> GCs;
+  typedef pmap<int, Gdk_GC> GCs;
   GCs _gcs;
 
   Gtk::Alignment *_label_align;

pandatool/src/lwo/lwoDiscontinuousVertexMap.h

@@ -45,8 +45,8 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef map<int, PTA_float> VMap;
+  typedef pmap<int, PTA_float> VMap;
-  typedef map<int, VMap> VMad;
+  typedef pmap<int, VMap> VMad;
   VMad _vmad;
 
 public:

pandatool/src/lwo/lwoGroupChunk.h

@@ -26,7 +26,7 @@
 
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : LwoGroupChunk
@@ -43,7 +43,7 @@ protected:
   bool read_subchunks_iff(IffInputFile *in, size_t stop_at);
   void write_chunks(ostream &out, int indent_level) const;
 
-  typedef vector< PT(IffChunk) > Chunks;
+  typedef pvector< PT(IffChunk) > Chunks;
   Chunks _chunks;
 
 public:

pandatool/src/lwo/lwoPoints.h

@@ -40,7 +40,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef vector<LPoint3f> Points;
+  typedef pvector<LPoint3f> Points;
   Points _points;
 
 public:

pandatool/src/lwo/lwoPolygonTags.h

@@ -42,7 +42,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef map<int, int> TMap;
+  typedef pmap<int, int> TMap;
   TMap _tmap;
 
 public:

pandatool/src/lwo/lwoPolygons.h

@@ -68,7 +68,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef vector< PT(Polygon) > Polygons;
+  typedef pvector< PT(Polygon) > Polygons;
   Polygons _polygons;
 
 public:

pandatool/src/lwo/lwoVertexMap.h

@@ -45,7 +45,7 @@ public:
   virtual void write(ostream &out, int indent_level = 0) const;
 
 private:
-  typedef map<int, PTA_float> VMap;
+  typedef pmap<int, PTA_float> VMap;
   VMap _vmap;
 
 public:

pandatool/src/lwoegg/cLwoPoints.h

@@ -25,7 +25,7 @@
 #include <eggVertexPool.h>
 #include <pointerTo.h>
 
-#include <map>
+#include "pmap.h"
 
 class LwoToEggConverter;
 class LwoVertexMap;
@@ -55,7 +55,7 @@ public:
 
   // A number of vertex maps of different types may be associated, but
   // we only care about some of the types here.
-  typedef map<string, const LwoVertexMap *> VMap;
+  typedef pmap<string, const LwoVertexMap *> VMap;
   VMap _txuv;
   VMap _pick;
 };

pandatool/src/lwoegg/cLwoPolygons.h

@@ -25,7 +25,7 @@
 #include <eggGroup.h>
 #include <pointerTo.h>
 
-#include <map>
+#include "pmap.h"
 
 class LwoToEggConverter;
 class CLwoPoints;
@@ -61,14 +61,14 @@ public:
   PT(EggGroup) _egg_group;
 
   const LwoTags *_tags;
-  typedef map<IffId, const LwoPolygonTags *> PTags;
+  typedef pmap<IffId, const LwoPolygonTags *> PTags;
   PTags _ptags;
 
   const LwoPolygonTags *_surf_ptags;
 
   // There might be named maps associated with the polygons to bring a
   // per-polygon mapping to the UV's.
-  typedef map<string, const LwoDiscontinuousVertexMap *> VMad;
+  typedef pmap<string, const LwoDiscontinuousVertexMap *> VMad;
   VMad _txuv;
 
 private:

pandatool/src/lwoegg/cLwoSurface.h

@@ -31,7 +31,7 @@
 #include <pt_EggMaterial.h>
 #include <vector_PT_EggVertex.h>
 
-#include <map>
+#include "pmap.h"
 
 class LwoToEggConverter;
 class LwoSurfaceBlock;

pandatool/src/lwoegg/lwoToEggConverter.h

@@ -25,8 +25,8 @@
 #include <lwoHeader.h>
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
-#include <map>
+#include "pmap.h"
 
 class CLwoLayer;
 class CLwoClip;
@@ -77,19 +77,19 @@ private:
   CPT(LwoHeader) _lwo_header;
 
   CLwoLayer *_generic_layer;
-  typedef vector<CLwoLayer *> Layers;
+  typedef pvector<CLwoLayer *> Layers;
   Layers _layers;
 
-  typedef vector<CLwoClip *> Clips;
+  typedef pvector<CLwoClip *> Clips;
   Clips _clips;
 
-  typedef vector<CLwoPoints *> Points;
+  typedef pvector<CLwoPoints *> Points;
   Points _points;
 
-  typedef vector<CLwoPolygons *> Polygons;
+  typedef pvector<CLwoPolygons *> Polygons;
   Polygons _polygons;
 
-  typedef map<string, CLwoSurface *> Surfaces;
+  typedef pmap<string, CLwoSurface *> Surfaces;
   Surfaces _surfaces;
 };
 

pandatool/src/maya/mayaFile.h

@@ -63,7 +63,7 @@ private:
 
   EggGroup *get_egg_group(const string &name, EggData &data);
 
-  typedef map<string, EggGroup *> Groups;
+  typedef pmap<string, EggGroup *> Groups;
   Groups _groups;
 
 public:

pandatool/src/maya/mayaShaders.h

@@ -21,7 +21,7 @@
 
 #include <pandatoolbase.h>
 
-#include <map>
+#include "pmap.h"
 #include <string>
 
 class MayaShader;
@@ -34,7 +34,7 @@ public:
 
 protected:
 
-  typedef map<string, MayaShader *> Shaders;
+  typedef pmap<string, MayaShader *> Shaders;
   Shaders _shaders;
 };
 

pandatool/src/progbase/programBase.h

@@ -26,9 +26,9 @@
 #include <vector_string.h>
 
 #include <string>
-#include <vector>
+#include "pvector.h"
-#include <deque>
+#include "pdeque.h"
-#include <map>
+#include "pmap.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : ProgramBase
@@ -51,7 +51,7 @@ public:
 
   virtual void parse_command_line(int argc, char *argv[]);
 
-  typedef deque<string> Args;
+  typedef pdeque<string> Args;
   Filename _program_name;
   Args _program_args;
 
@@ -129,14 +129,14 @@ private:
   typedef vector_string Runlines;
   Runlines _runlines;
 
-  typedef map<string, Option> OptionsByName;
+  typedef pmap<string, Option> OptionsByName;
-  typedef vector<const Option *> OptionsByIndex;
+  typedef pvector<const Option *> OptionsByIndex;
   OptionsByName _options_by_name;
   OptionsByIndex _options_by_index;
   int _next_sequence;
   bool _sorted_options;
 
-  typedef map<string, string> GotOptions;
+  typedef pmap<string, string> GotOptions;
   GotOptions _got_options;
 
   bool _last_newline;

pandatool/src/pstatserver/pStatClientData.h

@@ -27,7 +27,7 @@
 #include <referenceCount.h>
 #include <pointerTo.h>
 
-#include <vector>
+#include "pvector.h"
 
 class PStatReader;
 
@@ -80,7 +80,7 @@ private:
     bool _is_level;
   };
 
-  typedef vector<Collector> Collectors;
+  typedef pvector<Collector> Collectors;
   Collectors _collectors;
 
   class Thread {
@@ -88,7 +88,7 @@ private:
     string _name;
     PT(PStatThreadData) _data;
   };
-  typedef vector<Thread> Threads;
+  typedef pvector<Thread> Threads;
   Threads _threads;
 
   static PStatCollectorDef _null_collector;

pandatool/src/pstatserver/pStatGraph.h

@@ -27,7 +27,7 @@
 #include <luse.h>
 #include <vector_int.h>
 
-#include <map>
+#include "pmap.h"
 
 class PStatView;
 
@@ -104,7 +104,7 @@ protected:
   typedef vector_int Labels;
   Labels _labels;
 
-  typedef vector<GuideBar> GuideBars;
+  typedef pvector<GuideBar> GuideBars;
   GuideBars _guide_bars;
   int _guide_bar_units;
   string _unit_name;

pandatool/src/pstatserver/pStatMonitor.h

@@ -28,7 +28,7 @@
 #include <pointerTo.h>
 #include <luse.h>
 
-#include <map>
+#include "pmap.h"
 
 class PStatCollectorDef;
 
@@ -101,12 +101,12 @@ private:
   string _client_hostname;
   string _client_progname;
 
-  typedef map<int, PStatView> Views;
+  typedef pmap<int, PStatView> Views;
   Views _views;
-  typedef map<int, Views> LevelViews;
+  typedef pmap<int, Views> LevelViews;
   LevelViews _level_views;
 
-  typedef map<int, RGBColorf> Colors;
+  typedef pmap<int, RGBColorf> Colors;
   Colors _colors;
 };
 

pandatool/src/pstatserver/pStatPianoRoll.h

@@ -28,7 +28,7 @@
 #include <luse.h>
 #include <vector_int.h>
 
-#include <map>
+#include "pmap.h"
 
 class PStatFrameData;
 
@@ -83,7 +83,7 @@ private:
     float _start;
     float _end;
   };
-  typedef vector<ColorBar> ColorBars;
+  typedef pvector<ColorBar> ColorBars;
 
   class BarBuilder {
   public:
@@ -96,7 +96,7 @@ private:
     ColorBars _color_bars;
   };
 
-  typedef map<int, BarBuilder> PageData;
+  typedef pmap<int, BarBuilder> PageData;
   PageData _page_data;
   int _current_frame;
 };

pandatool/src/pstatserver/pStatServer.h

@@ -25,8 +25,8 @@
 
 #include <connectionManager.h>
 
-#include <map>
+#include "pmap.h"
-#include <deque>
+#include "pdeque.h"
 
 class PStatReader;
 
@@ -68,13 +68,13 @@ private:
 
   PStatListener *_listener;
 
-  typedef map<PT(Connection), PStatReader *> Readers;
+  typedef pmap<PT(Connection), PStatReader *> Readers;
   Readers _readers;
-  typedef vector<PStatReader *> LostReaders;
+  typedef pvector<PStatReader *> LostReaders;
   LostReaders _lost_readers;
   LostReaders _removed_readers;
 
-  typedef deque<int> Ports;
+  typedef pdeque<int> Ports;
   Ports _available_udp_ports;
   int _next_udp_port;
 };

pandatool/src/pstatserver/pStatStripChart.h

@@ -28,7 +28,7 @@
 #include <luse.h>
 #include <vector_int.h>
 
-#include <map>
+#include "pmap.h"
 
 class PStatView;
 
@@ -78,8 +78,8 @@ protected:
     int _collector_index;
     float _net_value;
   };
-  typedef vector<ColorData> FrameData;
+  typedef pvector<ColorData> FrameData;
-  typedef map<int, FrameData> Data;
+  typedef pmap<int, FrameData> Data;
 
   const FrameData &get_frame_data(int frame_number);
 

pandatool/src/pstatserver/pStatThreadData.h

@@ -23,7 +23,7 @@
 
 #include <referenceCount.h>
 
-#include <deque>
+#include "pdeque.h"
 
 class PStatCollectorDef;
 class PStatFrameData;
@@ -71,7 +71,7 @@ public:
 private:
   const PStatClientData *_client_data;
 
-  typedef deque<PStatFrameData *> Frames;
+  typedef pdeque<PStatFrameData *> Frames;
   Frames _frames;
   int _first_frame_number;
   float _history;

pandatool/src/pstatserver/pStatView.h

@@ -72,7 +72,7 @@ private:
   bool _show_level;
   bool _all_collectors_known;
 
-  typedef map<int, PStatViewLevel *> Levels;
+  typedef pmap<int, PStatViewLevel *> Levels;
   Levels _levels;
 
   int _level_index;

pandatool/src/pstatserver/pStatViewLevel.h

@@ -21,7 +21,7 @@
 
 #include <pandatoolbase.h>
 
-#include <vector>
+#include "pvector.h"
 
 class PStatClientData;
 
@@ -50,7 +50,7 @@ private:
   float _value_alone;
   PStatViewLevel *_parent;
 
-  typedef vector<PStatViewLevel *> Children;
+  typedef pvector<PStatViewLevel *> Children;
   Children _children;
 
   friend class PStatView;

pandatool/src/softprogs/softCVS.h

@@ -27,8 +27,8 @@
 #include <vector_string.h>
 #include <filename.h>
 
-#include <vector>
+#include "pvector.h"
-#include <set>
+#include "pset.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : SoftCVS
@@ -43,8 +43,8 @@ public:
   void run();
 
 private:
-  typedef vector<SoftFilename> SceneFiles;
+  typedef pvector<SoftFilename> SceneFiles;
-  typedef multiset<SoftFilename> ElementFiles;
+  typedef pmultipset<SoftFilename> ElementFiles;
 
   void traverse_root();
   void traverse_subdir(const Filename &directory);
@@ -54,7 +54,7 @@ private:
   void remove_unused_elements();
 
   bool rename_file(SceneFiles::iterator begin, SceneFiles::iterator end);
-  bool scan_cvs(const string &dirname, set<string> &cvs_elements);
+  bool scan_cvs(const string &dirname, pset<string> &cvs_elements);
 
   void scan_scene_file(istream &in);